diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2016-08-15 23:35:55 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2016-08-15 23:36:20 -0400 |
| commit | 68605df8c21a9f5b18b67780f956a758a42737dc (patch) | |
| tree | d4a700de2fc769fb2fd4072dfd28eab84ec80a7a /x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch | |
| parent | net-misc/dhcpcd: 6.11.3 version bump (diff) | |
| download | gentoo-68605df8c21a9f5b18b67780f956a758a42737dc.tar.gz gentoo-68605df8c21a9f5b18b67780f956a758a42737dc.tar.bz2 gentoo-68605df8c21a9f5b18b67780f956a758a42737dc.zip | |
x11-plugins/gkrellaclock: new revision to fix CC, CFLAGS, and LDFLAGS.
The build system for this package was a crude Makefile that has been
mostly replaced. The inspiration for the fixes was taken from a patch
by Gentoo user Michael Mair-Keimberger, who was also kind enough to
post an updated ebuild (which I've updated further to EAPI=6).
Gentoo-Bug: 339243
Package-Manager: portage-2.2.28
Diffstat (limited to 'x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch')
| -rw-r--r-- | x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch new file mode 100644 index 000000000000..6b48b6bf9015 --- /dev/null +++ b/x11-plugins/gkrellaclock/files/gkrellaclock-makefile.patch @@ -0,0 +1,53 @@ +diff --git a/Makefile b/Makefile +index eb2b8ad..c89fa17 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,39 +1,12 @@ + GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` + GTK_LIB = `pkg-config gtk+-2.0 --libs` + +-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) +-LIBS = $(GTK_LIB) +-LFLAGS = -shared ++CFLAGS += -fPIC $(GTK_INCLUDE) ++LIBS = $(GTK_LIB) ++LDFLAGS += -shared + +-CC = gcc $(CFLAGS) $(FLAGS) +- +-OBJS = gkrellaclock.o +- +-gkrellaclock.so: $(OBJS) +- $(CC) $(OBJS) -o gkrellaclock.so $(LFLAGS) $(LIBS) ++gkrellaclock.so: gkrellaclock.o ++ $(CC) $(CFLAGS) $(OBJS) -o gkrellaclock.so $(LDFLAGS) $(LIBS) + + clean: +- rm -f *.o core *.so* *.bak *~ +- +-gkrellaclock.o: gkrellaclock.c +- +-install: +- if [ -d /usr/local/lib/gkrellm2/plugins/ ] ; then \ +- install -c -s -m 644 gkrellaclock.so /usr/local/lib/gkrellm2/plugins/ ; \ +- elif [ -d /usr/lib/gkrellm2/plugins/ ] ; then \ +- install -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/ ; \ +- else \ +- install -D -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/gkrellaclock.so ; \ +- fi +-userinstall: +- if [ -d $(HOME)/.gkrellm2/plugins/ ] ; then \ +- install -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/ ; \ +- else \ +- install -D -c -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/gkrellaclock.so ; \ +- fi +- +-uninstall: +- rm -f /usr/local/lib/gkrellm2/plugins/gkrellaclock.so +- rm -f /usr/lib/gkrellm2/plugins/gkrellaclock.so +- rm -f $(HOME)/.gkrellm2/plugins/gkrellaclock.so +- ++ rm -f gkrellaclock.*o +diff --git a/gkrellaclock.o b/gkrellaclock.o +index e2db7c1..002ab3a 100644 +Binary files a/gkrellaclock.o and b/gkrellaclock.o differ |