[gentoo-commits] gentoo-x86 commit in dev-cpp/cppserv/files: cppserv-0.2.13-asneeded.patch

[gentoo-commits] gentoo-x86 commit in dev-cpp/cppserv/files: cppserv-0.2.13-asneeded.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/01/08 15:01:07

  Added:                cppserv-0.2.13-asneeded.patch
  Log:
  Fix building with -Wl,--as-needed wrt #296656, thanks to Kacper Kowalik for patch.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch?rev=1.1&content-type=text/plain

Index: cppserv-0.2.13-asneeded.patch
===================================================================
--- rules.mk
+++ rules.mk
@@ -253,7 +253,7 @@
 	$(Q)touch $$@
 $(ADON_BUILD)/$(1)/$(2).so: $(ADON_BUILD)/$(2)-dep $(3)
 	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(SHLIB_FLAGS) $$(ADON_LIBFLAGS) \
-	    $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@
+	    $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@ $($(2)_LIBADD)
 endef
 
 #FIXME: -fPIC is bit non-portable
@@ -300,7 +300,8 @@
 $(ADON_BUILD)/$(1)/$(2): $(ADON_BUILD)/$(2)-dep $(3)
 	$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(TARGET_LDFLAGS) \
 	    $$(TOP_LDFLAGS) $$(ADON_LIBFLAGS) \
-	    $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@
+	    $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@ \
+	    $($(2)_LDADD) 
 endef
 
 # curdir, progname, instvar
--- src/cxxsp/parser/Makefile.adon
+++ src/cxxsp/parser/Makefile.adon
@@ -28,7 +28,7 @@
 	csplex.lpp
 
 cxxsp_compile_SOURCES:= cxxsp_compile.cpp
-cxxsp_compile_LDFLAGS:= -lutil -lcxxsp_parser -ldl -lservlet -lcxxtaglib
+cxxsp_compile_LDADD:= -lutil -lcxxsp_parser -lservlet -lcxxtaglib -ldl
 cxxsp_compile_DEPS:=libcxxtaglib cxxsp_runtime_taglib
 
 noinst_HEADERS:= \
--- src/cxxsp/taglib/Makefile.adon
+++ src/cxxsp/taglib/Makefile.adon
@@ -21,6 +21,6 @@
 lib_LTLIBRARIES:=libcxxtaglib cxxsp_runtime_taglib
 libcxxtaglib_SOURCES:=Taglib.cpp CompileTimeTaglib.cpp
 cxxsp_runtime_taglib_SOURCES:=RunTimeTaglib.cpp
-cxxsp_runtime_taglib_LDFLAGS:=-lcxxtaglib
+cxxsp_runtime_taglib_LDADD:=-lcxxtaglib
 cxxsp_runtime_taglib_DEPS:=libcxxtaglib
 noinst_HEADERS:=RunTimeTaglib.h
--- src/container/Makefile.adon
+++ src/container/Makefile.adon
@@ -37,10 +37,10 @@
 	requesthandler.cpp \
 	cthreadpool.cpp \
 	requestlistener.cpp
-cppserv_LDFLAGS := -lservlet -lsputil3 -lsocket++ -lpthread -ldl -lserverconfig
+cppserv_LDADD := -lservlet -lsputil3 -lsocket++ -lpthread -lserverconfig -ldl
 cppserv_CPPFLAGS := -I$(ADON_SRC)/include/container
 cppserv_DEPS:= libservlet libserverconfig
 
 ifeq ($(HAVE_LIBMAGIC),1)
-cppserv_LDFLAGS+=-lmagic
+cppserv_LDADD+=-lmagic
 endif