diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-09-01 00:08:16 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-09-01 00:08:16 +0000 |
| commit | abbf434277af0eab37198f6b37aa3dce69ea1d85 (patch) | |
| tree | e80bf5b9bf737f8524a6d25cf4762a62fc298cde /games-strategy | |
| parent | Remove old (diff) | |
| download | historical-abbf434277af0eab37198f6b37aa3dce69ea1d85.tar.gz historical-abbf434277af0eab37198f6b37aa3dce69ea1d85.tar.bz2 historical-abbf434277af0eab37198f6b37aa3dce69ea1d85.zip | |
fix as-needed
Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/megaglest/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/megaglest/Manifest | 19 | ||||
| -rw-r--r-- | games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch | 30 | ||||
| -rw-r--r-- | games-strategy/megaglest/megaglest-3.6.0.3.ebuild | 7 |
4 files changed, 47 insertions, 15 deletions
diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog index 7828b8223a88..266c817c3896 100644 --- a/games-strategy/megaglest/ChangeLog +++ b/games-strategy/megaglest/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/megaglest # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.1 2012/08/19 21:15:08 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.2 2012/09/01 00:08:16 hasufell Exp $ + + 01 Sep 2012; Julian Ospald <hasufell@gentoo.org> megaglest-3.6.0.3.ebuild, + +files/megaglest-3.6.0.3-as-needed.patch: + fix as-needed *megaglest-3.6.0.3 (19 Aug 2012) diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest index 2044004d8411..44c7b84d8442 100644 --- a/games-strategy/megaglest/Manifest +++ b/games-strategy/megaglest/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX megaglest-3.6.0.3-as-needed.patch 909 SHA256 e3b2117f9e524e44e815d9fe7d56c7f807d0e6fd78d582f7dfa7ac0bd82d97c7 SHA512 4c2d371ebc132c5c608a2f5110af00001fb8214a0f99bd8bf1b6af61e0e5679df5593011bd2cf63489974b817ac133c157b46acf2398f11c9294e11215aae5e3 WHIRLPOOL c1397df2335f2076cf1bae3e68f02c9b717def51c706b3d7716436ee0df003fb8a5ad9927594612d0800ec13f71bdf4f90369234b70f9e5a37a7a0155f87a5e8 AUX megaglest-3.6.0.3-build.patch 1050 SHA256 fe00f58335e551b29e23efd66cb6ff16780d81c992522601981bd2a211932bc1 SHA512 f1ab9698f2a91a765a888030bb317d4ae6093f6070d7f068d142993100975be826c6db84278a6bb662b6a2e25df94b5968aa10cf9db08083d76e9c4beb4b2f62 WHIRLPOOL 04d1b7e3cd40a265a6ba181a63b28fbf5edef2b88174afda71fc5940ce2f3a65fbf77db1531c6e368619904bc5ab940279442c4d9a1b301d7f03ee9ac4020cfb AUX megaglest-3.6.0.3-static-build.patch 3821 SHA256 cca9eb7180bd4f47030d96d95ea0ff63b6ba567d1ace43df908bcb847d9b1c26 SHA512 2706643eaa597bc2629179541f180508c4d7f89f205e9a5a072671acaf0bb519ff216a5dc06feb11b74ff5614c9ef8e58f5031f3aaa66c1b27ab2f7b32927d60 WHIRLPOOL 2125cf9ab83e01d5a2987b5bf9f07f0a4e33d742585b0ff58bb6c0ae115cd2055bf4442ab26483bececa9fcba324a872af36d7a8cbb6f920797cfafbf595c28f DIST megaglest-source-3.6.0.3.tar.xz 1336432 SHA256 700b1eef534d72fa5efd329445aa085259a87dcea5e739eda629e6c41386b9f7 SHA512 0152457444c8d4ed65ed2ae565a73a2921a3706bb653fa818be03fb15d6fac196d50fc616583ce4c6fe7e76d4fb82cc83eb7c16809a90edf705701bab9c95387 WHIRLPOOL e452cd6dafb9024b663c62c9c3077af725601c6bc7b34b54cef641feb7ecbf2d1c1b6625e016e6e149055782d303a7bff78b59f29eb3c72d010c2a8b8a554b6f -EBUILD megaglest-3.6.0.3.ebuild 4282 SHA256 0e38eac661c29c3275370ee2a19d5b3be9109697d49134f4e6990c43a4cae186 SHA512 1755f6f93ff9d0ea017f2c2ac1c3a9cf64f98734980be44e769c7cf0750960db9877ba2e10dc3883cec7312570e96f536283684e1eb252314a0c9aa7b7bf4cd6 WHIRLPOOL 30d4a5ef2e9e810f49e81ff0004e9d381d0ef2568385e782b3f78b77db2874507e838df2ed94d450b49d092a405e8e06b1db93f57ff1746cb0ff818003a6119e -MISC ChangeLog 467 SHA256 b4c0a73586849cb9d4e959df33bed81b7a6ef3fbaff7b80806cf32e93e001cdb SHA512 78ca58c292bfc44b0a536815fdd763b1bf50c494e305d8317045efe1cf43a7e4b116717ac6c277fdcf90514bb2e0788599fe77bb10dbac6b04d94be361c206b2 WHIRLPOOL a88c70f7c5982cf63278097a67188f4c0c19ff7f0e84006e6fc70bfbed0de9f0a98df69123bde832ed459b0697f31aaf9e77ba661bed2812b3043fafe01d11fb +EBUILD megaglest-3.6.0.3.ebuild 4193 SHA256 cb5658b0344443043c34afff3b1843bc2ab94f7a8673e0c9801e60c1131a092a SHA512 5157cbfab6bc731b6f074097feed90394e8be73edb915095255f66df634ab2fd74f16f159ec723d97645312ffaf8e36619ed9610b3083ff59a8ee0c959a96320 WHIRLPOOL a7a15c9689d68e21d78db69444fa68b9625139c9c89723726545ae3af1c015bd98208344667b0efcc22c38abdd1e34d1edcd779ee6112c1b909e1d2aa7ee4638 +MISC ChangeLog 605 SHA256 f6650cc92f878038e1aa6cfd85ad8cd4d2d82479002bce20ebc63efb130a59f2 SHA512 f07d689cb5fd0f7c247d5e9899e9247c5a7471d26d886a97bad97f014d730c20f5dfec0dd3ae2c4872cf25c45398cf1a6d1ac7c083c35626fe0549a48077ba18 WHIRLPOOL 99bb30eac0366e688eb2fad5b98edd1ce0ace56af43f55574736feb0e53abddafae8a9534549e184f6366ff31203363f85f450a9718287d0dfb15f39c62af11e MISC metadata.xml 1673 SHA256 e82372357b85e23eab725ab1aaec9183f2df25f481b1bd2c972e5ef95136be00 SHA512 abaaaddadfd5db1b94c6281f3a46adfdaccd0f6b3172af887787a6c448e61601742f3f2663fb1c4dcb7b59deaf9fb3348d081683f65bc131c3dbb22516e3c7d7 WHIRLPOOL ca2dfc91de1fb3a4d560a97a876628d47f98b0f3a0e1165573c8c9381f7da5bbf7632670976c880953057a14c28a6fa34d6faabd1c936ec8473e5dcfadb81679 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQMVYxAAoJEFpvPKfnPDWzX0YIAKlVetKWop4bhgSz4AhSZ7hC -mwZhc+AC06XA3lBO9oOfCsXfA/7KLW7q8+dhWwpe4aPJQYI/hWgukvcx297Qz9qz -24WdvaOcxp/zQz3Nd7sWOWQzWJMVOQivpRpUdWcVR2bSjEijkHGbI5vWGfIQdvIQ -nbJPtZOKTlGkycNiTMC9vKgvgObf3uwKLef0coHjU1NpXd38bSA351N1ScQuDVW4 -AHbyK0EjNXwmsQkrVZgUMF337EU3sgJCwMQxovNnyavCGK74NVlw8H9bje8RafJQ -RtTWBSXYx1WLoy23CLA5BkBPH3FLu6lmjfc3CG9ChjxExsED8we+874Q5OxDIGo= -=Y9To +iQEcBAEBCAAGBQJQQVH5AAoJEFpvPKfnPDWzQc8IAJSc2M6R0RzxFt6/59B1PGBQ +Eael0v8m9r3cqMsSP1JdOC7KSRptNH3Lo3AFIFNCcD8qEc8+R+DZ8HGNkzdq6Ln5 +pUNCOxQeqkI99bYRm8rPsjWEWk96GCqgw+ZdeFJtT3Eglac9yS/f02MHLNFG2hnf ++xTgqRHXX9QJAhwutT8sThp5Pq4n0+I/WUQ3iaHgsTXcOnDdcbnvUJZh8ckNM6FK +J3Fj+SD7+LwuslexQ25DoxNyOJ4BzrDdQ5ABB8BIetpfv5oqXUdAkTujcZqekkGg +28btWWwqXIvNzJPYOoDGaalXJFZE+2AaCP1+g37T/iAYCtno+7QmFLmKpeFVIPQ= +=4nvq -----END PGP SIGNATURE----- diff --git a/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch b/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch new file mode 100644 index 000000000000..4dc5fd10b3fd --- /dev/null +++ b/games-strategy/megaglest/files/megaglest-3.6.0.3-as-needed.patch @@ -0,0 +1,30 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Fri Aug 31 23:45:34 UTC 2012 +Subject: fix as-needed + +reorder linker line (curl after libircclient) + +--- source/shared_lib/CMakeLists.txt ++++ source/shared_lib/CMakeLists.txt +@@ -47,9 +47,6 @@ + + FIND_PACKAGE(CURL REQUIRED) + INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) +- IF(UNIX) +- SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) +- ENDIF() + # check libcurl version # + IF(WIN32) + file (READ ${PROJECT_SOURCE_DIR}${CURL_INCLUDE_DIR}/curl/curlver.h CURL_VERSION_H_CONTENTS) +@@ -293,6 +290,11 @@ + SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${IRCCLIENT_LIBRARY}) + endif() + ++ # fix linking order, curl after libircclient ++ IF(UNIX) ++ SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${CURL_LIBRARIES}) ++ ENDIF() ++ + set(CMAKE_REQUIRED_INCLUDES "${IRCCLIENT_INCLUDE_DIR}") + set(CMAKE_REQUIRED_LIBRARIES "${IRCCLIENT_LIBRARY}") + check_cxx_source_runs(" diff --git a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild index 3bf56bfe5de8..4fe885edb2d2 100644 --- a/games-strategy/megaglest/megaglest-3.6.0.3.ebuild +++ b/games-strategy/megaglest/megaglest-3.6.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.1 2012/08/19 21:15:08 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.6.0.3.ebuild,v 1.2 2012/09/01 00:08:16 hasufell Exp $ EAPI=4 inherit eutils flag-o-matic cmake-utils wxwidgets gnome2-utils games @@ -63,7 +63,7 @@ src_prepare() { need-wxwidgets unicode fi - epatch "${FILESDIR}"/${P}-{static-build,build}.patch + epatch "${FILESDIR}"/${P}-{static-build,build,as-needed}.patch } src_configure() { @@ -102,9 +102,6 @@ src_configure() { # support CMAKE_BUILD_TYPE=Gentoo append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"' - # as-needed is broken for ld.bfd here - # ld.gold works either way - append-ldflags $(no-as-needed) cmake-utils_src_configure } |