diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2016-08-06 21:27:41 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2016-08-06 21:27:41 -0400 |
| commit | b731c87c096e0bf11ca86b12c63bcf39d89bb1f8 (patch) | |
| tree | bd0075d334379207bbbaaffd5280d0f06eeadceb /x11-plugins/gkrellm-countdown/files | |
| parent | net-dns/rbldnsd: new revision with EAPI=6 and dropping eutils. (diff) | |
| download | gentoo-b731c87c096e0bf11ca86b12c63bcf39d89bb1f8.tar.gz gentoo-b731c87c096e0bf11ca86b12c63bcf39d89bb1f8.tar.bz2 gentoo-b731c87c096e0bf11ca86b12c63bcf39d89bb1f8.zip | |
x11-plugins/gkrellm-countdown: new revision fixing HOMEPAGE and LDFLAGS.
This new revision fixes two bugs, both thanks to Michael
Mair-Keimberger who posted patches to our bugzilla. The first is that
the upstream build system did not support LDFLAGS -- it now does, with
a patched Makefile. Michael also corrected the invalid HOMEPAGE
variable, and added the ~amd64 keyword (which I am able to test).
The ebuild has been updated to EAPI=6.
Gentoo-Bug: 339657
Gentoo-Bug: 367171
Package-Manager: portage-2.2.28
Diffstat (limited to 'x11-plugins/gkrellm-countdown/files')
| -rw-r--r-- | x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch new file mode 100644 index 000000000000..af241de73e92 --- /dev/null +++ b/x11-plugins/gkrellm-countdown/files/gkrellm-countdown-makefile.patch @@ -0,0 +1,40 @@ +This patch is by Michael Mair-Keimberger, as part of bug 339657. It +teaches the Makefile to support the user's LDFLAGS. + +Gentoo-Bug: 339657 + +--- a/Makefile 2003-12-30 23:07:29.000000000 +0100 ++++ b/Makefile 2013-03-16 14:23:47.671010566 +0100 +@@ -9,7 +9,7 @@ + IMLIB_LIB ?= + PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins + +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) ++FLAGS = -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) + LIBS = $(GTK_LIB) $(IMLIB_LIB) + LFLAGS = -shared -lpthread + +@@ -22,8 +22,8 @@ + FLAGS += -DPACKAGE="\"$(PACKAGE)\"" + export PACKAGE LOCALEDIR + +-CC ?= gcc +-CC += $(CFLAGS) $(FLAGS) ++ ++CC = $(CC) + + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s +@@ -32,8 +32,11 @@ + + all: $(BIN_FILENAME).so + ++%.o: %.c ++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) -c -o $@ $< ++ + $(BIN_FILENAME).so: $(OBJS) +- $(CC) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(FLAGS) $(OBJS) -o $(BIN_FILENAME).so $(LFLAGS) $(LIBS) + + clean: + rm -f *.o core *.so* *.bak *~ |