diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-03-07 09:53:16 +0100 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2012-03-07 09:53:16 +0100 |
| commit | f7ae8c996d6436963176f7019e36bd1d9f240c9f (patch) | |
| tree | 19bb80275b5f1f337d303bec853afc679e7b8933 | |
| parent | bump farstream (diff) | |
| parent | Change patch for test failure, according to file change. (diff) | |
| download | keruspe-f7ae8c996d6436963176f7019e36bd1d9f240c9f.tar.gz keruspe-f7ae8c996d6436963176f7019e36bd1d9f240c9f.tar.bz2 keruspe-f7ae8c996d6436963176f7019e36bd1d9f240c9f.zip | |
Merge branch 'master' of git://github.com/Keruspe/Keruspe-overlay
* 'master' of git://github.com/Keruspe/Keruspe-overlay:
Change patch for test failure, according to file change.
| -rw-r--r-- | dev-libs/glib/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.24-assert-test-failure.patch | 11 | ||||
| -rw-r--r-- | dev-libs/glib/glib-9999-r1.ebuild | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 5ac5f0b4..e6db4d9c 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,7 +1,7 @@ AUX external-gdbus-codegen.patch 3606 RMD160 18a1f414c10a14fc5628c804952e1caf1bda1a86 SHA1 9a3176cc9223e383a752623b9ebbe2b81c1f9c1d SHA256 ab33c9cea821b9f99145ba4ebc68ddb8d6049a844641553959904793125ed8a9 AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb -AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af +AUX glib-2.24-assert-test-failure.patch 451 RMD160 8528793f4b8d0ebff3c841dbf418b49a8d3faf5e SHA1 18b61527c8c31fa497161949e4ecf5f42251b11d SHA256 a4a671669a4d1ba4f5cc9cff55b77bde28a63d86e6aba9567ea6d310dfc24f22 AUX glib-2.30.1-homedir-env.patch 1849 RMD160 2bbe190e2d6ee96cb33dcfe37c1ff227ea4e8ca9 SHA1 42077f9373acce576b4eb811b6464f0332db7711 SHA256 4f0e149703a9aadc4fb568b9fa00419b9848b345b19d3cc9e1a2bd67985ea25b DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af -EBUILD glib-9999-r1.ebuild 7992 RMD160 f832910aba302f8466e1e5db5ed0184db7ad4cad SHA1 5a7e47f914e4ef4b31c0d4afc0d24a5f6ac90bbf SHA256 61c0e40c11dac78a8281ccdb0eb91f8bb98189b35dc091fe6fa3e047eb80300d +EBUILD glib-9999-r1.ebuild 7918 RMD160 41a24ff633a56a0d55cd9d84daa6ca9a0a4fbb9a SHA1 a8325dd22598c7d24e3fb8aa95f90627f8a7dca4 SHA256 f796f5af2c8e1315554df3023daa7ad3a8a9e06fcec8a17357e693226d7a1e24 diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch index 6d8e74f3..1c68b7b3 100644 --- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch +++ b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch @@ -1,12 +1,3 @@ -Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed -because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This -causes gdb to use the system-wide glib instead, and fail on the test. - -This patch exports LD_LIBRARY_PATH before running gdb - -https://bugzilla.gnome.org/621368 - ---- --- tests/run-assert-msg-test.sh +++ tests/run-assert-msg-test.sh @@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then @@ -14,6 +5,6 @@ https://bugzilla.gnome.org/621368 fi echo_v "Running gdb on assert-msg-test" +export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH" - OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ + OUT=$(libtool --mode=execute gdb --batch --ex run --ex "set print elements 0" --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \ fail "failed to run gdb" diff --git a/dev-libs/glib/glib-9999-r1.ebuild b/dev-libs/glib/glib-9999-r1.ebuild index fb18a072..7f3a5763 100644 --- a/dev-libs/glib/glib-9999-r1.ebuild +++ b/dev-libs/glib/glib-9999-r1.ebuild @@ -59,7 +59,6 @@ src_prepare() { # Fix gmodule issues on fbsd; bug #184301 epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch - # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368 epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch" # Do not try to remove files on live filesystem, upstream bug #619274 |