diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-04-30 14:29:12 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-04-30 14:29:12 +0000 |
| commit | 393fc2635697839f38a536d14ecd7e51e4ec1c1a (patch) | |
| tree | 70dabaea83700eaad416c00a2e129ab233960fea /dev-libs/glib/files | |
| parent | Version bump. Adjust openresolv dependency, bug 467762 by Francisco Vazquez. (diff) | |
| download | gentoo-2-393fc2635697839f38a536d14ecd7e51e4ec1c1a.tar.gz gentoo-2-393fc2635697839f38a536d14ecd7e51e4ec1c1a.tar.bz2 gentoo-2-393fc2635697839f38a536d14ecd7e51e4ec1c1a.zip | |
On second thought, fix automake-1.13 compatibility properly, with patches.
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'dev-libs/glib/files')
| -rw-r--r-- | dev-libs/glib/files/glib-1.2.10-automake-1.13.patch | 23 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.34.3-automake-1.13.patch | 23 |
2 files changed, 46 insertions, 0 deletions
diff --git a/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch b/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch new file mode 100644 index 000000000000..abca1ed8db19 --- /dev/null +++ b/dev-libs/glib/files/glib-1.2.10-automake-1.13.patch @@ -0,0 +1,23 @@ +Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 + +diff --git a/configure.in b/configure.in +index e94cc77..d88d834 100644 +--- a/configure.in ++++ b/configure.in +@@ -60,7 +60,7 @@ PACKAGE=glib + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + + # Specify a configuration file +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_DEFINE_UNQUOTED(GLIB_MAJOR_VERSION, $GLIB_MAJOR_VERSION) + AC_DEFINE_UNQUOTED(GLIB_MINOR_VERSION, $GLIB_MINOR_VERSION) +@@ -151,7 +151,6 @@ AC_DEFINE_UNQUOTED(G_COMPILED_WITH_DEBUGGING, "${enable_debug}") + + # Checks for programs. + AC_PROG_CC +-AM_PROG_CC_STDC + AC_PROG_INSTALL + + changequote(,)dnl diff --git a/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch b/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch new file mode 100644 index 000000000000..5f4e7b6bbd32 --- /dev/null +++ b/dev-libs/glib/files/glib-2.34.3-automake-1.13.patch @@ -0,0 +1,23 @@ +Replace macros deprecated in automake-1.13; fixed upstream in glib-2.36 + +diff --git a/configure.ac b/configure.ac +index a3567b3..3e3d697 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ m4_define([glib_debug_default], + AC_INIT(glib, [glib_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=glib]) + +-AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([glib/glib.h]) + AC_CONFIG_MACRO_DIR([m4macros]) + +@@ -291,7 +291,6 @@ AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=) + AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""]) + AC_LANG_RESTORE + +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_PROG_INSTALL + |