diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-08-03 00:24:52 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-08-03 00:24:52 +0000 |
| commit | cb3e13aa6081f7b0bec93068e3d83769b71f4ef9 (patch) | |
| tree | fffd2c9980d41848ea73023b80e62c46f10bb2d5 /dev-util/coccinelle | |
| parent | Add an ebuild for Adobe's Source Sans Pro, their first open source font family (diff) | |
| download | historical-cb3e13aa6081f7b0bec93068e3d83769b71f4ef9.tar.gz historical-cb3e13aa6081f7b0bec93068e3d83769b71f4ef9.tar.bz2 historical-cb3e13aa6081f7b0bec93068e3d83769b71f4ef9.zip | |
Fix configure method of looking for external tools (bug #429556).
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'dev-util/coccinelle')
| -rw-r--r-- | dev-util/coccinelle/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/coccinelle/Manifest | 19 | ||||
| -rw-r--r-- | dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/coccinelle/files/coccinelle-1.0.0_rc14-findtool.patch | 22 |
4 files changed, 45 insertions, 12 deletions
diff --git a/dev-util/coccinelle/ChangeLog b/dev-util/coccinelle/ChangeLog index 754dbd838a4d..d059bedc6aea 100644 --- a/dev-util/coccinelle/ChangeLog +++ b/dev-util/coccinelle/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/coccinelle # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.21 2012/08/01 07:15:14 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.22 2012/08/03 00:24:52 radhermit Exp $ + + 03 Aug 2012; Tim Harder <radhermit@gentoo.org> coccinelle-1.0.0_rc14.ebuild, + +files/coccinelle-1.0.0_rc14-findtool.patch: + Fix configure method of looking for external tools (bug #429556). 01 Aug 2012; Tim Harder <radhermit@gentoo.org> -coccinelle-1.0.0_rc11.ebuild, -files/coccinelle-1.0.0_rc7-parallel-make.patch: diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest index 8683d8dc5f32..5de0ee713a97 100644 --- a/dev-util/coccinelle/Manifest +++ b/dev-util/coccinelle/Manifest @@ -2,20 +2,21 @@ Hash: SHA256 AUX 50coccinelle-gentoo.el 154 SHA256 66dba99a78fd02b8b232b14b11d6f2b2595dd5bfa867d5bb16be117999fbb4cc SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d WHIRLPOOL 84ee1036e267f8079fc43eff7ea8313f913b96b0a2869e99c3e684c6b73992a2d7fa0a44a030f894557f1e34fa1d1a1f86543dfa5072fbc9f6505be9650de4a2 +AUX coccinelle-1.0.0_rc14-findtool.patch 685 SHA256 c33224288cc3a7c768e5bac7f2035b2de82a84c12e0bb6b3a098d683ae7cc369 SHA512 4cbf0facf3557a1c24db3197995bf3b2ad2e922c1dde562c1b94b903d9557854bff3f13fe63aae8ad66aee177d0baa739a0a4ced5f1cf93ac3052e53c249b05a WHIRLPOOL b7bda3485e10389add3bd1e388aae18d560adce3fd3c3b3115bf0b6521205f99354ce780f26da3698ea2edfcbf9c8866007f16de8f947dfddab6a5dfe571fc35 DIST coccinelle-1.0.0-rc12.tgz 3197967 SHA256 03b8930a53623ec79dc2486e9b6a569e373958cf46074c5f1d0028c70708498d SHA512 82344ad238057eb978dcbaa61c0db40159d6219b53c795ea8040ddc7bb52023e5c147ea443010661de20681b1185e7c4b56728f70f6e2756860eb83d7f10a45e WHIRLPOOL efb4a71366bc64dbb30b2b15e3b056ccbe145afc0eb5f39a67d1bc760fd03734caeea37b815c6477759171a833d08a206e25621d8e44be9f83248a3c62a30bff DIST coccinelle-1.0.0-rc14.tgz 3529203 SHA256 9e5c08ea1684e595508beeaa602387334e18260e00fdc15d71a33a9084b8dc77 SHA512 87dc23b2479a2799279025215ffa580ca4a1be24867f1a5f083e0804a604d19e10ccd2eeb4c783a6b1ef41fa2a71530d8bf8834c093b035501555d0db3bcd1c2 WHIRLPOOL 4d1786e398710e33c53aab208b1ff128c5d71f1e5c172a8d3ce8bbde0a628e93f9c4287e213387807e74e10e4933addde07bc71f82a058131b88bf9f1887a365 EBUILD coccinelle-1.0.0_rc12.ebuild 2997 SHA256 497780d81868e19b6dceb497627cc1c28338187a56dfe9bc43cd8b9559569ffd SHA512 338faa950fc80be639ad214752d8a66f003bddaf496e0406fd98e85d15567c5bf795d12a922c0568ebfd0ad85c4258dde8b64de0ea6417145c690e49b9d86b6b WHIRLPOOL a96baccb25398e879ec6af77fd6537540ea8c81be70430d1a08dcc7f2841b87e47729455def6f563f61bc4c33c5b136b0e482cb003ff23ac9b16c681ae8595b7 -EBUILD coccinelle-1.0.0_rc14.ebuild 2997 SHA256 d7d7c0aa56e12a649b1fe73e5bf59ddc4d01c090e0991b37b7e35fd8f9afc207 SHA512 5d54005a1cd6d5ea42de970a6c936c8c85cc87c80d5320993b1cd705957fe8190ede233f4263f299aef40c78cd1ea95186d3f7aefebdeceaec71471ccfbb595c WHIRLPOOL 5fd3dec468cbadda024a8a59ae4ce5f6eebcb8cd88f73da6e5108b6b5b3d67bf95947504293c3f2fc70bc932bff76afaca6b1d6f393d84ddd5f2d6eb43b09cd6 -MISC ChangeLog 3630 SHA256 83c0343cab142bed13aacf2adc119f70e1723a8b658ade3bd3a39063c8078a92 SHA512 19e6f0c0d7be58eba925552788ce7a308e995807728191cf574efe365ada5a3e7582078f5e0fb739af3d7431d373e63a738233f781bddfa139f4b8df6588252d WHIRLPOOL 93490fe5fca4e3225c283032741ab29a331d4b67d1c94f0c9b3967dc94d8344c8b1d80114384ba771e249a3b68bee516660aa54b2d564581702bf87643ec8ffa +EBUILD coccinelle-1.0.0_rc14.ebuild 3132 SHA256 80a59a02f086bd0d3e39a8d54791ea11abf1c6cd07c324580930dccdaa58b5af SHA512 fd031c14f26684bca7b5b6f5c280eee7051b991e40f67b3cfb4cd434ca4be132fffe5eb6cf43ea797e7e7c6934fec501bb65a162ab0ef9d26f7d054d79a754c0 WHIRLPOOL 987be955eb3a6aa837e48925f84d560fd92f41bb859b215c97d98543c3a7f5a7c090a529574946308b29f5b8a8547037d6afb1cede848a835f4487168075eef9 +MISC ChangeLog 3825 SHA256 a7ef45908a6c0c7405e77d8961ad780324c8b7e7a90e3f4dd99a2f074148e257 SHA512 b9dd66dc119a0ab582afd0827c662921237ecda3be62453095c4f9ba25eca9e7116bd9b97ae901074679041d0f2166e3b6b4b53e2ec3359fd1d2b2166c028ff4 WHIRLPOOL 0c0c6b3275d7b686dc3fbddf58297c49ab72042bb0bcebf802a3d5edf240bd9db45cb4e78af8a1bee2b4e6fe727c7a6abb801d3473afe6080705867d136a804c MISC metadata.xml 246 SHA256 7c41a7e52e792cf6b02e544290706ab0266df8c36214b503083c4daa89a636fe SHA512 2f2e5377658d7b8bb082253b0fb66d54c086e005cbc574f60050b41c039f116e9dc142d1618950f635de7ddd9ab0e7f15c431f660e81bacd01215cbf25be589e WHIRLPOOL f63fe763cf8a07f7c56f0f55a72f1b567d91dbc477654939933178af55edc4687700d0952424669006b301377ccffd3b1510b2290e75b070e1c23b7d9f74f4dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQGNeHAAoJEEqz6FtPBkyjt+kH/0wbrYxIf9HBRaOY6vWYnNS0 -QsdrvEVCWOQqufduZjvR19mDBpxoWlcMaEN3Z8XrwbMOuGipLSxnYhciisc3vFgU -5Ovxu2q22Q5X8oP8VPmYtbYjFUBki9C6lTQ6eF881YARxvZpB9D1SNlht+o41KQn -+xK1HBVGty6PCZM78zeqztU21Illhe864DRdZg6yoSrk3wuKY8rIxmk3nqG2YEHR -pB/GaJDsMrkjAeoozlt3SOPUN7bA5MbRUxMiHdQn9M62WqQUHGN22dE6Dpd0MQEC -myBYxA/msyY0rj013dfbjNH13sEmxPyDdsEsxdXW8QrsywYJ327PMNzUhqftuH0= -=gG8S +iQEcBAEBCAAGBQJQGxphAAoJEEqz6FtPBkyjRaYH/3nHa4pp7RXW3J4jCiVTAvTZ +isz10G0Y2jIQAmw/40y0CtBgE3za+x6g9YwszuIia6BFdb79JbWt+AOdtAxYM2hh +JDnc6hcVaAuEHbHcO2P/6bVWyLfriBbAKKdeP/aaoB7UMYG14FcCeLlJHgI+DU8t +79CB8aWBz0yPQ+wIffyJSoFCtJiP4Xjh5RRH3yNdzni5z7Uv/3N7SllNrw7IqcZD +jNxxtbOsLa9/9Y/cEzUnEjUO+QhP5hPrytS8J6rU3LoSn0nZNrAxHkhPdRpGOegP +ybmsyF1C0WayzvLtotsYNYkJzc4T8PP8r3ZsQkfhAuOzu9k6eaRIWKcKVA7aioo= +=Hxry -----END PGP SIGNATURE----- diff --git a/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild b/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild index 28f1fc9a37fe..b292dd3dc6b6 100644 --- a/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild +++ b/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild,v 1.1 2012/08/01 07:12:04 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild,v 1.2 2012/08/03 00:24:52 radhermit Exp $ EAPI="4" PYTHON_DEPEND="python? 2" -inherit multilib eutils python bash-completion-r1 elisp-common +inherit multilib eutils python bash-completion-r1 elisp-common autotools MY_P="${P/_/-}" DESCRIPTION="Program matching and transformation engine" @@ -59,6 +59,10 @@ src_prepare() { sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \ scripts/spatch.sh.in || die fi + + epatch "${FILESDIR}"/${P}-findtool.patch + cp Makefile Makefile.orig || die + eautoreconf } src_configure() { @@ -71,6 +75,8 @@ src_configure() { sed -i -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \ -e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \ Makefile.config || die + + cp Makefile.orig Makefile || die } src_compile() { diff --git a/dev-util/coccinelle/files/coccinelle-1.0.0_rc14-findtool.patch b/dev-util/coccinelle/files/coccinelle-1.0.0_rc14-findtool.patch new file mode 100644 index 000000000000..56ddbdc2e307 --- /dev/null +++ b/dev-util/coccinelle/files/coccinelle-1.0.0_rc14-findtool.patch @@ -0,0 +1,22 @@ +--- coccinelle-1.0.0-rc14/configure.ac ++++ coccinelle-1.0.0-rc14/configure.ac +@@ -3,6 +3,8 @@ + AC_INIT([coccinelle], m4_esyscmd([cat ./version | tr -d '\n']), [cocci@diku.dk], [], [http://coccinelle.lip6.fr/]) + AC_CONFIG_MACRO_DIR([setup]) + AC_CONFIG_AUX_DIR([setup]) ++AM_INIT_AUTOMAKE ++AC_CONFIG_FILES([Makefile]) + + AC_SUBST([CONFIGURE_FLAGS], ["$*"]) + AC_SUBST([COCCI_VERSION], ["$PACKAGE_VERSION"]) +--- coccinelle-1.0.0-rc14/setup/cocci.m4 ++++ coccinelle-1.0.0-rc14/setup/cocci.m4 +@@ -285,7 +285,7 @@ + AC_SUBST([$1], [no]) + ], + [dnl find the tool +- AC_COCCI_FINDTOOL([$1],[[$]$1]) ++ AC_COCCI_FINDTOOL([$1],[$2]) + ]) + + AS_IF([test -z "[$]$1" -o "x[$]$1" = xno], |