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 | 62835137a8a6ad21584bbb13b80cc7069e13cc1c (patch) | |
| tree | 630966d92f4f2f7269dfa9d858b328452c01d615 /dev-util | |
| parent | Add an ebuild for Adobe's Source Sans Pro, their first open source font family (diff) | |
| download | gentoo-2-62835137a8a6ad21584bbb13b80cc7069e13cc1c.tar.gz gentoo-2-62835137a8a6ad21584bbb13b80cc7069e13cc1c.tar.bz2 gentoo-2-62835137a8a6ad21584bbb13b80cc7069e13cc1c.zip | |
Fix configure method of looking for external tools (bug #429556).
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/coccinelle/ChangeLog | 6 | ||||
| -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 |
3 files changed, 35 insertions, 3 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/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], |