From e2cf3c6ccc473e1f4e06926c7948cf0da1f95b45 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 19 Apr 2012 14:55:58 +0000 Subject: [PATCH] - added libelf patch: hack to use -lelf to link only gresource tool instead of everything - BR: elfutils-devel - release 2 Changed files: glib2-libelf.patch -> 1.1 glib2.spec -> 1.259 --- glib2-libelf.patch | 21 +++++++++++++++++++++ glib2.spec | 5 ++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 glib2-libelf.patch diff --git a/glib2-libelf.patch b/glib2-libelf.patch new file mode 100644 index 0000000..fe6ba68 --- /dev/null +++ b/glib2-libelf.patch @@ -0,0 +1,21 @@ +--- glib-2.32.1/configure.ac.orig 2012-04-13 15:39:41.000000000 +0200 ++++ glib-2.32.1/configure.ac 2012-04-18 21:22:32.292969778 +0200 +@@ -1816,14 +1816,14 @@ + 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_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 ++ have_libelf=yes + fi + fi + diff --git a/glib2.spec b/glib2.spec index 878c37c..42faa35 100644 --- a/glib2.spec +++ b/glib2.spec @@ -19,18 +19,20 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı Summary(zh_CN.UTF-8): 实用工具函数库 Name: glib2 Version: 2.32.1 -Release: 1 +Release: 2 Epoch: 1 License: LGPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-%{version}.tar.xz # Source0-md5: 032c7cf9868c9aa186b490b155a41144 Patch0: %{name}-makefile.patch +Patch1: %{name}-libelf.patch URL: http://www.gtk.org/ BuildRequires: autoconf >= 2.62 BuildRequires: automake >= 1:1.11 BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl +BuildRequires: elfutils-devel BuildRequires: fam-devel BuildRequires: gettext-devel %{?with_apidocs:BuildRequires: gtk-doc >= 1.17} @@ -201,6 +203,7 @@ Bashowe uzupełnianie nazw dla narzędzi gio: gdbus i gsettings. %prep %setup -q -n glib-%{version} %patch0 -p1 +%patch1 -p1 %if !%{with apidocs} %{__sed} -e '/SUBDIRS/s/docs//' -i Makefile.am -- 2.44.0