From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXSYq-0001VN-8T for garchives@archives.gentoo.org; Thu, 24 May 2012 07:34:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40EDEE079D; Thu, 24 May 2012 07:33:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F002AE079D for ; Thu, 24 May 2012 07:33:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 174C41B402C for ; Thu, 24 May 2012 07:33:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CCFE6E542A for ; Thu, 24 May 2012 07:33:56 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <1337844771.30b674018829b9b8404ddee6d091d8deda6851d6.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/ X-VCS-Repository: proj/gnome X-VCS-Files: dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch dev-libs/glib/glib-9999.ebuild X-VCS-Directories: dev-libs/glib/files/ dev-libs/glib/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 30b674018829b9b8404ddee6d091d8deda6851d6 X-VCS-Branch: master Date: Thu, 24 May 2012 07:33:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a9a901c6-0258-477e-af37-aec28c5b0f2d X-Archives-Hash: 690226e55e00dccdfdd9b8efda4582e7 commit: 30b674018829b9b8404ddee6d091d8deda6851d6 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu May 24 07:25:24 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Thu May 24 07:32:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D30b67401 sys-devel/gcc: update Requested by Sholy. There is now a configure switch for disabling tests. Drop ancient ia64 patch (does not apply, and should not be needed for current stable versions of gcc on ia64). Drop assert-test-failure patch (fixed upstream). --- .../glib/files/glib-2.10.3-ia64-atomic-ops.patch | 39 --------------= ------ dev-libs/glib/glib-9999.ebuild | 25 ++----------- 2 files changed, 3 insertions(+), 61 deletions(-) diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-= libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch deleted file mode 100644 index 0859e33..0000000 --- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch +++ /dev/null @@ -1,39 +0,0 @@ -From Debian, this one is needed for gcc < 4.1... - ---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000 -+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000 -@@ -414,14 +414,14 @@ - g_atomic_int_exchange_and_add (volatile gint *atomic, - gint val) - { -- return __sync_fetch_and_add (atomic, val); -+ return __sync_fetch_and_add_si (atomic, val); - } - =20 - void - g_atomic_int_add (volatile gint *atomic,=20 - gint val) - { -- __sync_fetch_and_add (atomic, val); -+ __sync_fetch_and_add_si (atomic, val); - } -=20 - gboolean -@@ -429,7 +429,7 @@ - gint oldval,=20 - gint newval) - { -- return __sync_bool_compare_and_swap (atomic, oldval, newval); -+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval); - } -=20 - gboolean -@@ -437,7 +437,7 @@ - gpointer oldval,=20 - gpointer newval) - { -- return __sync_bool_compare_and_swap ((long *)atomic,=20 -+ return __sync_bool_compare_and_swap_di ((long *)atomic,=20 - (long)oldval, (long)newval); - } -=20 diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu= ild index ac3895a..73676d1 100644 --- a/dev-libs/glib/glib-9999.ebuild +++ b/dev-libs/glib/glib-9999.ebuild @@ -39,7 +39,7 @@ DEPEND=3D"${RDEPEND} >=3Ddev-libs/libxslt-1.0 >=3Ddev-util/gdbus-codegen-${PV} >=3Ddev-util/gtk-doc-1.15 - ~app-text/docbook-xml-dtd-4.1.2 ) + app-text/docbook-xml-dtd:4.1.2 ) systemtap? ( >=3Ddev-util/systemtap-1.3 ) test? ( sys-devel/gdb @@ -69,34 +69,14 @@ src_prepare() { [[ ${PV} =3D 9999 ]] && gnome2-live_src_prepare mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die =20 - if use ia64 ; then - # Only apply for < 4.1 - local major=3D$(gcc-major-version) - local minor=3D$(gcc-minor-version) - if (( major < 4 || ( major =3D=3D 4 && minor =3D=3D 0 ) )); then - epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" - fi - fi - - # Don't fail gio tests when ran without userpriv, upstream bug 552912 - # This is only a temporary workaround, remove as soon as possible -# epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-u= serpriv.patch" - # Fix gmodule issues on fbsd; bug #184301 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch =20 - # Fix test failure during upgrades, upstream bug 621368 - epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch" - # Do not try to remove files on live filesystem, upstream bug #619274 sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" =20 - # need to build tests if USE=3Ddoc for bug #387385 - if ! use test && ! use doc; then - # don't waste time building tests - sed 's/^\(.*\SUBDIRS .*\=3D.*\)tests\(.*\)$/\1\2/' -i $(find . -name M= akefile.am -o -name Makefile.in) || die - else + if use test; then # Disable tests requiring dev-util/desktop-file-utils when not install= ed, bug #286629 if ! has_version dev-util/desktop-file-utils ; then ewarn "Some tests will be skipped due dev-util/desktop-file-utils not= being present on your system," @@ -170,6 +150,7 @@ src_configure() { $(use_enable static-libs static) \ $(use_enable systemtap dtrace) \ $(use_enable systemtap systemtap) \ + $(use_enable test modular-tests) \ --with-pcre=3Dinternal \ --with-threads=3Dposix }