3 files changed, 72 insertions, 4 deletions
diff --git a/dev-cpp/cppserv/ChangeLog b/dev-cpp/cppserv/ChangeLog
index de14026899ed..5e2e7623133b 100644
--- a/dev-cpp/cppserv/ChangeLog
+++ b/dev-cpp/cppserv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/cppserv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.49 2009/10/07 06:48:18 iluxa Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/ChangeLog,v 1.50 2010/01/08 15:01:06 ssuominen Exp $
+
+  08 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> cppserv-0.2.13.ebuild,
+  +files/cppserv-0.2.13-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #296656, thanks to Kacper Kowalik
+  for patch.
 
   07 Oct 2009; Ilya A. Volynets-Evenbakh <iluxa@gentoo.org>
   cppserv-0.1.119.ebuild, cppserv-0.2.13.ebuild:
diff --git a/dev-cpp/cppserv/cppserv-0.2.13.ebuild b/dev-cpp/cppserv/cppserv-0.2.13.ebuild
index ac76a99d4558..0e9557264ce3 100644
--- a/dev-cpp/cppserv/cppserv-0.2.13.ebuild
+++ b/dev-cpp/cppserv/cppserv-0.2.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.2.13.ebuild,v 1.2 2009/10/07 06:48:18 iluxa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cppserv/cppserv-0.2.13.ebuild,v 1.3 2010/01/08 15:01:06 ssuominen Exp $
 
 inherit eutils apache-module multilib
 
@@ -31,6 +31,12 @@ cppserv_build_flags() {
 	echo PREFIX=/usr LIB=/$(get_libdir) ADON_VERBOSE=1 ADON_BUILD=release APRCFG_PATH=/usr/bin/apr-1-config  ${CPPSERV_DBG_FLAG}
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
 src_compile() {
 	emake $(cppserv_build_flags) || die "emake failed. Bug iluxa on #cppserv on irc.freenode.net immediately"
 }
diff --git a/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch b/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch
new file mode 100644
index 000000000000..9de15af67fdc
--- /dev/null
+++ b/dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch
@@ -0,0 +1,57 @@
+--- 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