| 1 |
ssuominen 10/01/08 15:01:07 |
| 2 |
|
| 3 |
Added: cppserv-0.2.13-asneeded.patch |
| 4 |
Log: |
| 5 |
Fix building with -Wl,--as-needed wrt #296656, thanks to Kacper Kowalik for patch. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch?rev=1.1&view=markup |
| 12 |
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 |
| 13 |
|
| 14 |
Index: cppserv-0.2.13-asneeded.patch |
| 15 |
=================================================================== |
| 16 |
--- rules.mk |
| 17 |
+++ rules.mk |
| 18 |
@@ -253,7 +253,7 @@ |
| 19 |
$(Q)touch $$@ |
| 20 |
$(ADON_BUILD)/$(1)/$(2).so: $(ADON_BUILD)/$(2)-dep $(3) |
| 21 |
$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(SHLIB_FLAGS) $$(ADON_LIBFLAGS) \ |
| 22 |
- $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@ |
| 23 |
+ $($(2)_SHLIB_FLAGS) $($(2)_LDFLAGS) $(LOCAL_LDADD) -Wl,-soname,$(2).so -shared -o $$@ $($(2)_LIBADD) |
| 24 |
endef |
| 25 |
|
| 26 |
#FIXME: -fPIC is bit non-portable |
| 27 |
@@ -300,7 +300,8 @@ |
| 28 |
$(ADON_BUILD)/$(1)/$(2): $(ADON_BUILD)/$(2)-dep $(3) |
| 29 |
$(LINK) $$(filter-out $(ADON_BUILD)/$(2)-dep,$$^) $$(TARGET_LDFLAGS) \ |
| 30 |
$$(TOP_LDFLAGS) $$(ADON_LIBFLAGS) \ |
| 31 |
- $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@ |
| 32 |
+ $(LOCAL_LDFLAGS) $($(2)_LDFLAGS) $$(LDFLAGS) -o $$@ \ |
| 33 |
+ $($(2)_LDADD) |
| 34 |
endef |
| 35 |
|
| 36 |
# curdir, progname, instvar |
| 37 |
--- src/cxxsp/parser/Makefile.adon |
| 38 |
+++ src/cxxsp/parser/Makefile.adon |
| 39 |
@@ -28,7 +28,7 @@ |
| 40 |
csplex.lpp |
| 41 |
|
| 42 |
cxxsp_compile_SOURCES:= cxxsp_compile.cpp |
| 43 |
-cxxsp_compile_LDFLAGS:= -lutil -lcxxsp_parser -ldl -lservlet -lcxxtaglib |
| 44 |
+cxxsp_compile_LDADD:= -lutil -lcxxsp_parser -lservlet -lcxxtaglib -ldl |
| 45 |
cxxsp_compile_DEPS:=libcxxtaglib cxxsp_runtime_taglib |
| 46 |
|
| 47 |
noinst_HEADERS:= \ |
| 48 |
--- src/cxxsp/taglib/Makefile.adon |
| 49 |
+++ src/cxxsp/taglib/Makefile.adon |
| 50 |
@@ -21,6 +21,6 @@ |
| 51 |
lib_LTLIBRARIES:=libcxxtaglib cxxsp_runtime_taglib |
| 52 |
libcxxtaglib_SOURCES:=Taglib.cpp CompileTimeTaglib.cpp |
| 53 |
cxxsp_runtime_taglib_SOURCES:=RunTimeTaglib.cpp |
| 54 |
-cxxsp_runtime_taglib_LDFLAGS:=-lcxxtaglib |
| 55 |
+cxxsp_runtime_taglib_LDADD:=-lcxxtaglib |
| 56 |
cxxsp_runtime_taglib_DEPS:=libcxxtaglib |
| 57 |
noinst_HEADERS:=RunTimeTaglib.h |
| 58 |
--- src/container/Makefile.adon |
| 59 |
+++ src/container/Makefile.adon |
| 60 |
@@ -37,10 +37,10 @@ |
| 61 |
requesthandler.cpp \ |
| 62 |
cthreadpool.cpp \ |
| 63 |
requestlistener.cpp |
| 64 |
-cppserv_LDFLAGS := -lservlet -lsputil3 -lsocket++ -lpthread -ldl -lserverconfig |
| 65 |
+cppserv_LDADD := -lservlet -lsputil3 -lsocket++ -lpthread -lserverconfig -ldl |
| 66 |
cppserv_CPPFLAGS := -I$(ADON_SRC)/include/container |
| 67 |
cppserv_DEPS:= libservlet libserverconfig |
| 68 |
|
| 69 |
ifeq ($(HAVE_LIBMAGIC),1) |
| 70 |
-cppserv_LDFLAGS+=-lmagic |
| 71 |
+cppserv_LDADD+=-lmagic |
| 72 |
endif |
Archives