diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 15:01:06 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-08 15:01:06 +0000 |
commit | a09ba299c8e61a186b54091658a5621eca82717c (patch) | |
tree | 5397de302b2f70ae5db82be2cb82020e1d7c847b /dev-cpp | |
parent | Fix building with -Wl,--as-needed wrt #248546, thanks to Kacper Kowalik for p... (diff) | |
download | historical-a09ba299c8e61a186b54091658a5621eca82717c.tar.gz historical-a09ba299c8e61a186b54091658a5621eca82717c.tar.bz2 historical-a09ba299c8e61a186b54091658a5621eca82717c.zip |
Fix building with -Wl,--as-needed wrt #296656, thanks to Kacper Kowalik for patch.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/cppserv/ChangeLog | 9 | ||||
-rw-r--r-- | dev-cpp/cppserv/Manifest | 5 | ||||
-rw-r--r-- | dev-cpp/cppserv/cppserv-0.2.13.ebuild | 10 | ||||
-rw-r--r-- | dev-cpp/cppserv/files/cppserv-0.2.13-asneeded.patch | 57 |
4 files changed, 75 insertions, 6 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/Manifest b/dev-cpp/cppserv/Manifest index 2997a6e32030..b281d4baf5cb 100644 --- a/dev-cpp/cppserv/Manifest +++ b/dev-cpp/cppserv/Manifest @@ -1,7 +1,8 @@ AUX 75_mod_cserv.conf 231 RMD160 8e0e799a476d4d2cba3ccc992eb3687b17e9f127 SHA1 a35f3196ff880de9f196e01a407db52c61ced631 SHA256 86b338abda5d6966bfc885030c18132e78e3fc2b69d09b1901cf54e309552474 +AUX cppserv-0.2.13-asneeded.patch 2079 RMD160 a1ab2a5b68f8dbaaf21d058caca9c8108a49c1f2 SHA1 95e8ccac30815cbdfed6ecd75ef21b5476a30155 SHA256 f3245c13452c1ab92011bbbfea8b5ddc5c3060ecbd8f085650c2e77b0956b407 DIST cppserv-0.1.119.tar.bz2 130753 RMD160 3e8fab59a0a1db47346ff974b8f0b920fa12f75d SHA1 47e6ce9675a18b411bf65e57cebba857187ef0c6 SHA256 3892b0d2320b1b002d128ffd9abd88cbce53b0e576b9c0f025dc066f6845c2a5 DIST cppserv-0.2.13.tar.bz2 140435 RMD160 9adc00a1e9661d0908fa7f5b129a7f1eb6ba00b6 SHA1 6fa3600d398520fd8d104b94620ba5ddf6489eb6 SHA256 1ab0920ec74e709736209f0c595867964552ddc37538fc1b90f1b5e1499ad000 EBUILD cppserv-0.1.119.ebuild 1599 RMD160 2cd0bef690205f1c2c646fb7376dd0a0efe97f8c SHA1 17319a7355e147405e8609b902167a168b8b3f61 SHA256 108234731a98814eeba09ea10c7f16e79a0c5f5232acd9a1664284ebf67a5744 -EBUILD cppserv-0.2.13.ebuild 1568 RMD160 6f8f3342ada2b3b5dcb23f7815b7cb7d580b589b SHA1 6b5f02d28209ef7234304028e0965d4bc03b06d6 SHA256 cd4de3e514377268055a71832049a0e13f1593ffa51170df2d81d4e567e5dfe0 -MISC ChangeLog 8358 RMD160 9f8d7daaa2c3da04f37531a2b22d8a43f88ac224 SHA1 1549c8d87db0552ed025bc6ac6028cd82e5c8bd3 SHA256 49938f06277614309afe0c63312b481e924e72dcc0fa49b2377e6f81d9257858 +EBUILD cppserv-0.2.13.ebuild 1656 RMD160 2edf70dc3ea14440330d083d116c3bf042ce96c7 SHA1 7a7dd4ed13a4f18c8929b3bbb5b6a989adabd334 SHA256 70fa81ee01d75f515acc09d10164c82a95d44b8978c2002b619c91dbc0cd4ce1 +MISC ChangeLog 8567 RMD160 a3698a57832e3685acd6d82e33307cc8007148a9 SHA1 c78c26d31da7a61209d308fe68dae27354a0475e SHA256 bc283381c66d00243afab5f6c2c53e4791ddb4c6218d2289e7f50e7812337169 MISC metadata.xml 600 RMD160 c9f6bc48b1a249bc45694ead1bce81ae4884e20b SHA1 82c78fe487e15395dac82d6b120ba4a8dd02c32a SHA256 c782d5a3513f3575a8b5795171f5e9507858b36ec6321d9e698432d96c219837 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 |