[gentoo-commits] gentoo-x86 commit in sys-cluster/feedbackd-agent/files: feedbackd-agent-0.4-asneeded.patch compile-gnu-source.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/03/29 12:25:26

  Added:                feedbackd-agent-0.4-asneeded.patch
  Removed:              compile-gnu-source.patch
  Log:
  Fix building with -Wl,--as-needed wrt #248411 by Kacper Kowalik.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/feedbackd-agent/files/feedbackd-agent-0.4-asneeded.patch?rev=1.1&content-type=text/plain

Index: feedbackd-agent-0.4-asneeded.patch
===================================================================
--- Makefile.in
+++ Makefile.in
@@ -34,13 +34,16 @@
 # build flags
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ @DEFS@ -I.
-LDFLAGS = @LDFLAGS@ @LIBS@
+LDFLAGS = @LDFLAGS@ 
+LIBS = @LIBS@
 
 XML_CFLAGS = @XML_CFLAGS@
-XML_LDFLAGS = @XML_LDFLAGS@ @XML_LIBS@
+XML_LDFLAGS = @XML_LDFLAGS@ 
+LIBS += @XML_LIBS@
 
 PERL_CFLAGS = @PERL_CFLAGS@
-PERL_LDFLAGS = @PERL_LDFLAGS@ @PERL_LIBS@
+PERL_LDFLAGS = @PERL_LDFLAGS@ 
+LIBS += @PERL_LIBS@
 
 # build targets
 PLUGINS = @PLUGINS@
@@ -63,7 +66,7 @@
 # feedbackd-agent main program
 $(AGENT): src/feedbackd-agent
 
-src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o)
+src/feedbackd-agent: $(foreach f, $($(AGENT)_objs), src/$(f).o) $(LIBS)
 
 src/feedbackd-agent: CFLAGS  += $(XML_CFLAGS)
 src/feedbackd-agent: LDFLAGS += $(XML_LDFLAGS)
@@ -75,7 +78,7 @@
 $(PLUGINS) : % : src/plugins/%.so
 
 src/plugins/%.so: src/plugins/%.o
-	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^
+	$(CC) -shared -nostartfiles $(LDFLAGS) -o $@ $^ $(LIBS)
 
 src/plugins/%.so: CFLAGS+=-fPIC $(XML_CFLAGS)
 src/plugins/%.so: LDFLAGS+=$(XML_LDFLAGS)