diff options
| author |   Peter Volkov <pva@gentoo.org> | 2013-04-26 20:29:34 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2013-04-26 20:29:34 +0000 |
| commit | 3f9c7d9f815e65daa24e67cdd26258a6b4ac9294 (patch) | |
| tree | aec213183fe798845167f68be3cb7476903a0388 /app-i18n/enca | |
| parent | Drop old (diff) | |
| download | gentoo-2-3f9c7d9f815e65daa24e67cdd26258a6b4ac9294.tar.gz gentoo-2-3f9c7d9f815e65daa24e67cdd26258a6b4ac9294.tar.bz2 gentoo-2-3f9c7d9f815e65daa24e67cdd26258a6b4ac9294.zip | |
Fix build problem with automake 1.13
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key F1989B07)
Diffstat (limited to 'app-i18n/enca')
| -rw-r--r-- | app-i18n/enca/ChangeLog | 6 | ||||
| -rw-r--r-- | app-i18n/enca/enca-1.14.ebuild | 4 | ||||
| -rw-r--r-- | app-i18n/enca/files/enca-1.14-automake-1.13.patch | 34 |
3 files changed, 42 insertions, 2 deletions
diff --git a/app-i18n/enca/ChangeLog b/app-i18n/enca/ChangeLog index 2e4c332ebfee..455db86440d7 100644 --- a/app-i18n/enca/ChangeLog +++ b/app-i18n/enca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-i18n/enca # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.93 2013/01/22 17:32:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/ChangeLog,v 1.94 2013/04/26 20:29:33 pva Exp $ + + 26 Apr 2013; Peter Volkov <pva@gentoo.org> + +files/enca-1.14-automake-1.13.patch, enca-1.14.ebuild: + Fix build problem with automake 1.13 22 Jan 2013; Agostino Sarubbo <ago@gentoo.org> enca-1.13-r3.ebuild: Stable for x86, wrt bug #452454 diff --git a/app-i18n/enca/enca-1.14.ebuild b/app-i18n/enca/enca-1.14.ebuild index 17a9efb0d493..34b546b860ea 100644 --- a/app-i18n/enca/enca-1.14.ebuild +++ b/app-i18n/enca/enca-1.14.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14.ebuild,v 1.1 2013/01/16 09:43:31 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/enca/enca-1.14.ebuild,v 1.2 2013/04/26 20:29:33 pva Exp $ EAPI="4" @@ -22,6 +22,8 @@ AUTOTOOLS_AUTORECONF=2.52 src_prepare() { epatch "${FILESDIR}"/${PN}-remove-dirty-path-hack.patch + epatch "${FILESDIR}"/${P}-automake-1.13.patch + rm missing # too old, automake will update it # fix crosscompilation, bug #424473 if tc-is-cross-compiler; then sed -e "s#./make_hash#./native_make_hash#" -i tools/Makefile.am || die diff --git a/app-i18n/enca/files/enca-1.14-automake-1.13.patch b/app-i18n/enca/files/enca-1.14-automake-1.13.patch new file mode 100644 index 000000000000..653295793fa1 --- /dev/null +++ b/app-i18n/enca/files/enca-1.14-automake-1.13.patch @@ -0,0 +1,34 @@ +diff --git a/configure.ac b/configure.ac +index 956763d..6a624ab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ AC_CONFIG_FILES( \ + test/Makefile \ + tools/Makefile) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE([1.8 gnits check-news dist-bzip2]) + AM_ACLOCAL_INCLUDE(m4) + AM_MAINTAINER_MODE +@@ -40,7 +40,7 @@ AC_GNU_SOURCE + AC_AIX + AC_ISC_POSIX + AC_PROG_LIBTOOL +-AM_PROG_CC_STDC ++AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LN_S +diff --git a/m4/typevar.m4 b/m4/typevar.m4 +index ce9578d..66077eb 100644 +--- a/m4/typevar.m4 ++++ b/m4/typevar.m4 +@@ -6,7 +6,6 @@ + ## defined in errno.h + AC_DEFUN([ye_CHECK_VAR_PROGRAM_INVOCATION_SHORT_NAME], + [AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AM_PROG_CC_STDC])dnl + dnl + + dnl Check for program_invocation_short_name (present on GNU systems only?) |