Archives
Archives
| From: | "Hans de Graaff (graaff)" <graaff@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in mail-client/mail-notification/files: mail-notification-5.4-asneeded.patch |
| Date: | Sat, 01 May 2010 08:27:58 |
| Message-Id: | 20100501082752.2A5C32C0B9@corvid.gentoo.org |
| 1 | graaff 10/05/01 08:27:51 |
| 2 | |
| 3 | Added: mail-notification-5.4-asneeded.patch |
| 4 | Log: |
| 5 | Fix compilation with forced --as-needed, fixes bug 317905. Thanks to Kacper Kowalik for the patch. |
| 6 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/mail-notification/files/mail-notification-5.4-asneeded.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: mail-notification-5.4-asneeded.patch |
| 15 | =================================================================== |
| 16 | Fixing as-needed issues |
| 17 | |
| 18 | http://bugs.gentoo.org/show_bug.cgi?id=317905 |
| 19 | |
| 20 | Patch written by Kacper Kowalik <xarthisius.kk@×××××.com> |
| 21 | |
| 22 | --- jb |
| 23 | +++ jb |
| 24 | @@ -89,10 +89,11 @@ |
| 25 | |
| 26 | mkdir -p build/jbsrc || exit 1 |
| 27 | |
| 28 | - if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then |
| 29 | + if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then |
| 30 | echo "ERROR: the GLib library was not found" >&2 |
| 31 | exit 1 |
| 32 | fi |
| 33 | + gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null` |
| 34 | |
| 35 | sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \ |
| 36 | jbsrc/jb.c > build/jbsrc/jb.c || exit 1 |
| 37 | @@ -103,14 +104,15 @@ |
| 38 | -DG_LOG_DOMAIN="\"jb\"" \ |
| 39 | -DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \ |
| 40 | -DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \ |
| 41 | - $gobject_cflags_libs \ |
| 42 | + $gobject_cflags \ |
| 43 | $jb_cflags \ |
| 44 | $jb_cppflags \ |
| 45 | $jb_ldflags \ |
| 46 | build/jbsrc/jb.c \ |
| 47 | $jb_c_sources \ |
| 48 | $jb_c_package_sources \ |
| 49 | - $jb_libs; then |
| 50 | + $jb_libs \ |
| 51 | + $gobject_libs; then |
| 52 | echo "ERROR: cannot build jb" >&2 |
| 53 | exit 1 |
| 54 | fi |