r34685 - in /desktop/unstable/glib2.0/debian: changelog patches/96_configure-Reset-LIBS-after-ELF-check.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue May  1 18:02:16 2012
New Revision: 34685

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34685
Log:
debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch: Reset LIBS
after running the ELF checks otherwise we end up linking everything
against libelf. Patch cherry-picked from upstream Git.

Added:
    desktop/unstable/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=34685&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue May  1 18:02:16 2012
@@ -5,8 +5,11 @@
   * Remove debian/patches/git_powerpc_gresources.patch, merged upstream.
   * debian/patches/95_configure-Fix-typo-in-ELF-check.patch: Fix typo in ELF
     configure check. Patch cherry-picked from upstream Git.
-
- -- Michael Biebl <biebl at debian.org>  Tue, 01 May 2012 17:36:36 +0200
+  * debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch: Reset LIBS
+    after running the ELF checks otherwise we end up linking everything
+    against libelf. Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 01 May 2012 20:01:13 +0200
 
 glib2.0 (2.32.1-1) unstable; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch?rev=34685&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/96_configure-Reset-LIBS-after-ELF-check.patch [utf-8] Tue May  1 18:02:16 2012
@@ -1,0 +1,29 @@
+From 7fe1f97a128be5f48dcd1232250e96bd581a35c1 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Tue, 1 May 2012 18:42:12 +0200
+Subject: [PATCH] configure: Reset LIBS after ELF check
+
+If action-if-found is not specified, AC_CHECK_LIB will append the library
+to LIBS. As we don't want to link everything against libelf, reset LIBS
+after doing the checks.
+---
+ configure.ac |    2 ++
+ 1 file changed, 2 insertions(+)
+
+Index: glib-2.32.2/configure.ac
+===================================================================
+--- glib-2.32.2.orig/configure.ac	2012-05-01 20:00:42.839506415 +0200
++++ glib-2.32.2/configure.ac	2012-05-01 20:00:42.867506416 +0200
+@@ -1821,10 +1821,12 @@
+ PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe])
+ 
+ if test $have_libelf = maybe; then
++  glib_save_LIBS=$LIBS
+   AC_CHECK_LIB([elf], [elf_begin], , [have_libelf=no])
+   AC_CHECK_LIB([elf], [elf_getshdrstrndx], , [have_libelf=no])
+   AC_CHECK_LIB([elf], [elf_getshdrnum], , [have_libelf=no])
+   AC_CHECK_HEADER([libelf.h], , [have_libelf=no])
++  LIBS=$glib_save_LIBS
+ 
+   if test $have_libelf != no; then
+     LIBELF_LIBS=-lelf

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=34685&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Tue May  1 18:02:16 2012
@@ -7,3 +7,4 @@
 90_gio-modules-multiarch-compat.patch
 91_revert_schema_path_warning.patch
 95_configure-Fix-typo-in-ELF-check.patch
+96_configure-Reset-LIBS-after-ELF-check.patch