[gentoo-commits] gentoo-x86 commit in x11-plugins/gkrellkam/files: gkrellkam-2.0.0-makefile.patch

[Pacho Ramos (pacho)]

pacho       13/08/31 14:41:51

  Added:                gkrellkam-2.0.0-makefile.patch
  Log:
  Fix LDFLAGS/gcc usage (#338903), deps (#421703) and gcc-4.7 building (#426454). By Michael Mair-Keimberger (iamnr3).
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.1                  x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch?rev=1.1&content-type=text/plain

Index: gkrellkam-2.0.0-makefile.patch
===================================================================
--- Makefile	2002-10-23 18:36:20.000000000 +0200
+++ Makefile_new	2013-03-16 14:02:42.979029588 +0100
@@ -12,10 +12,10 @@
 # This should point to the GKrellM headers
 GKRELLM_HDRS = /usr/include
 
-CC := gcc
+CC = $(CC)
 GTKFLAGS := $(shell pkg-config gtk+-2.0 --cflags)
-CFLAGS := $(CFLAGS) -fPIC -Wall $(GTKFLAGS) -I$(GKRELLM_HDRS)
-LDFLAGS := -shared -Wl
+CFLAGS := $(CFLAGS) -fPIC $(GTKFLAGS) -I$(GKRELLM_HDRS)
+LFLAGS = -shared
 INST_DIR := $(DESTDIR)/usr/lib/gkrellm2/plugins
 USER_INST_DIR := $(DESTDIR)$(HOME)/.gkrellm2/plugins
 MANPAGES := gkrellkam-list.5
@@ -26,7 +26,7 @@
 all: $(TARGET).so
 
 %.so: %.o
-	$(CC) $(LDFLAGS) -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $<
 
 clean:
 	-rm -f $(TARGET).so $(TARGET).o