diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2014-03-04 16:45:38 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2014-03-04 16:45:38 +0000 |
| commit | 9cd2207d14f0226930cf0ecde82ee33f22fd1767 (patch) | |
| tree | 5db1bde8f7eb35ed6153c44c2913c352e39896b2 /dev-libs/glib | |
| parent | new version (diff) | |
| download | gentoo-2-9cd2207d14f0226930cf0ecde82ee33f22fd1767.tar.gz gentoo-2-9cd2207d14f0226930cf0ecde82ee33f22fd1767.tar.bz2 gentoo-2-9cd2207d14f0226930cf0ecde82ee33f22fd1767.zip | |
Apply a upstream patch to fix non POSIX test construction. #500996
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'dev-libs/glib')
| -rw-r--r-- | dev-libs/glib/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.38.2-configure.patch | 24 | ||||
| -rw-r--r-- | dev-libs/glib/glib-2.38.2.ebuild | 4 |
3 files changed, 32 insertions, 2 deletions
diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog index 91f371a7c45d..d417c17f0bf3 100644 --- a/dev-libs/glib/ChangeLog +++ b/dev-libs/glib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/glib # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.591 2014/02/22 14:37:00 hattya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.592 2014/03/04 16:45:38 naota Exp $ + + 04 Mar 2014; Naohiro Aota <naota@gentoo.org> + +files/glib-2.38.2-configure.patch, glib-2.38.2.ebuild: + Apply a upstream patch to fix non POSIX test construction. #500996 22 Feb 2014; Akinori Hattori <hattya@gentoo.org> glib-2.36.4-r1.ebuild: ia64 stable wrt bug #494132 diff --git a/dev-libs/glib/files/glib-2.38.2-configure.patch b/dev-libs/glib/files/glib-2.38.2-configure.patch new file mode 100644 index 000000000000..8f08ca0fafe3 --- /dev/null +++ b/dev-libs/glib/files/glib-2.38.2-configure.patch @@ -0,0 +1,24 @@ +From 838b49ead77c35d94fa16d48a6d7271bab082a71 Mon Sep 17 00:00:00 2001 +From: Patrick Welche <prlw1@cam.ac.uk> +Date: Thu, 07 Nov 2013 10:58:46 +0000 +Subject: configure: test(1) uses = to test for string equality + +https://bugzilla.gnome.org/show_bug.cgi?id=711600 +--- +(limited to 'm4macros/glibtests.m4') + +diff --git a/m4macros/glibtests.m4 b/m4macros/glibtests.m4 +index 27e9024..7d5920a 100644 +--- a/m4macros/glibtests.m4 ++++ b/m4macros/glibtests.m4 +@@ -21,7 +21,7 @@ AC_DEFUN([GLIB_TESTS], + *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;; + esac]) + AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1") +- if test "$ENABLE_INSTALLED_TESTS" == "1"; then ++ if test "$ENABLE_INSTALLED_TESTS" = "1"; then + AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME) + AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME) + fi +-- +cgit v0.9.2 diff --git a/dev-libs/glib/glib-2.38.2.ebuild b/dev-libs/glib/glib-2.38.2.ebuild index 1a492d50f7bd..7bb5d2b138d4 100644 --- a/dev-libs/glib/glib-2.38.2.ebuild +++ b/dev-libs/glib/glib-2.38.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2.ebuild,v 1.2 2014/01/18 04:44:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2.ebuild,v 1.3 2014/03/04 16:45:38 naota Exp $ EAPI="5" PYTHON_COMPAT=( python2_{6,7} ) @@ -150,6 +150,8 @@ src_prepare() { # Support compilation in clang until upstream solves this, upstream bug #691608 append-flags -Wno-format-nonliteral + epatch "${FILESDIR}"/${P}-configure.patch #500996 + epatch_user # Needed for the punt-python-check patch, disabling timeout test |