diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-01 16:25:41 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:14:11 -0700 |
| commit | b32156ab2b365b4210257d10d2fb7570d968ce2a (patch) | |
| tree | 96a47568d544098ab27bac8d4e48c7f3713f566f /glib-patches | |
| parent | bde0ffb4446d75ac22bcb4c04d76d9da3fc3c33d (diff) | |
| download | pkg-config-b32156ab2b365b4210257d10d2fb7570d968ce2a.tar.gz | |
glib: Update snapshot to 2.32.2
A libelf pkg-config check creeped in, but it's only used in gio so we
can remove the libelf check completely.
Diffstat (limited to 'glib-patches')
| -rw-r--r-- | glib-patches/no-pkg-config.patch | 37 | ||||
| -rwxr-xr-x | glib-patches/update-glib.sh | 2 |
2 files changed, 34 insertions, 5 deletions
diff --git a/glib-patches/no-pkg-config.patch b/glib-patches/no-pkg-config.patch index 4ca2bb3..80adf51 100644 --- a/glib-patches/no-pkg-config.patch +++ b/glib-patches/no-pkg-config.patch @@ -1,8 +1,8 @@ diff --git a/glib/configure.ac b/glib/configure.ac -index 41780cd..4cfd8fa 100644 +index 3bba0fd..d551832 100644 --- a/glib/configure.ac +++ b/glib/configure.ac -@@ -277,8 +277,6 @@ AC_PROG_INSTALL +@@ -294,8 +294,6 @@ AC_PROG_INSTALL AC_SYS_LARGEFILE @@ -11,7 +11,7 @@ index 41780cd..4cfd8fa 100644 if test "x$enable_debug" = "xyes"; then if test x$cflags_set != xset ; then case " $CFLAGS " in -@@ -437,23 +435,6 @@ AC_MSG_RESULT($enable_iconv_cache) +@@ -454,23 +452,6 @@ AC_MSG_RESULT($enable_iconv_cache) dnl @@ -35,7 +35,36 @@ index 41780cd..4cfd8fa 100644 dnl gettext support dnl -@@ -3312,12 +3293,7 @@ AC_CHECK_ALIGNOF([unsigned long]) +@@ -1799,28 +1780,6 @@ dnl failure. try libattr + fi + AC_SUBST(XATTR_LIBS) + +-dnl ************************ +-dnl *** check for libelf *** +-dnl ************************ +- +-PKG_CHECK_MODULES([LIBELF], [libelf], [have_libelf=yes], [have_libelf=maybe]) +- +-if test $have_libelf = maybe; then +- 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]) +- +- if test $have_libelf != no; then +- LIBELF_LIBS=-lelf +- have_libelf = yes +- fi +-fi +- +-if test $have_libelf = yes; then +- AC_DEFINE(HAVE_LIBELF, 1, [Define if libelf is available]) +-fi +- + dnl **************************************** + dnl *** platform dependent source checks *** + dnl **************************************** +@@ -3355,12 +3314,7 @@ AC_CHECK_ALIGNOF([unsigned long]) # Check for libdbus1 - Optional - is only used in the GDBus test cases # # 1.2.14 required for dbus_message_set_serial diff --git a/glib-patches/update-glib.sh b/glib-patches/update-glib.sh index 5edca8f..62608e4 100755 --- a/glib-patches/update-glib.sh +++ b/glib-patches/update-glib.sh @@ -4,7 +4,7 @@ GIT=${GIT-git} PATCH=${PATCH-patch} SED=${SED-sed} repo= -tag=2.32.0 +tag=2.32.2 commit=n usage() |