diff --git a/elfutils/001-libintl-linking.patch b/elfutils/001-libintl-linking.patch new file mode 100644 index 00000000..bd1fe445 --- /dev/null +++ b/elfutils/001-libintl-linking.patch @@ -0,0 +1,33 @@ +--- elfutils-0.173/libelf/Makefile.am.orig 2018-07-30 10:25:51.581470000 +0300 ++++ elfutils-0.173/libelf/Makefile.am 2018-07-30 10:26:08.741500100 +0300 +@@ -96,7 +96,7 @@ + am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) + + libelf_so_DEPS = ../lib/libeu.a +-libelf_so_LDLIBS = $(libelf_so_DEPS) -lz ++libelf_so_LDLIBS = $(libelf_so_DEPS) -lz -lintl + if USE_LOCKS + libelf_so_LDLIBS += -lpthread + endif +--- elfutils-0.173/libdw/Makefile.am.orig 2018-07-30 10:53:44.228407500 +0300 ++++ elfutils-0.173/libdw/Makefile.am 2018-07-30 10:53:49.173616200 +0300 +@@ -108,7 +108,7 @@ + libdw_so_LIBS = libdw_pic.a ../libdwelf/libdwelf_pic.a \ + ../libdwfl/libdwfl_pic.a ../libebl/libebl.a + libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so +-libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) ++libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz -lintl $(argp_LDADD) $(zip_LIBS) + libdw_so_SOURCES = + libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) + # The rpath is necessary for libebl because its $ORIGIN use will +--- elfutils-0.173/libasm/Makefile.am.orig 2018-07-30 11:02:16.191106800 +0300 ++++ elfutils-0.173/libasm/Makefile.am 2018-07-30 11:02:37.048343400 +0300 +@@ -56,7 +56,7 @@ + am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) + + libasm_so_DEPS = ../lib/libeu.a ../libebl/libebl.a ../libelf/libelf.so ../libdw/libdw.so +-libasm_so_LDLIBS = $(libasm_so_DEPS) ++libasm_so_LDLIBS = $(libasm_so_DEPS) -lintl + if USE_LOCKS + libasm_so_LDLIBS += -lpthread + endif diff --git a/elfutils/002-disable-new-dtags-flag.patch b/elfutils/002-disable-new-dtags-flag.patch new file mode 100644 index 00000000..f65c46c5 --- /dev/null +++ b/elfutils/002-disable-new-dtags-flag.patch @@ -0,0 +1,10 @@ +--- elfutils-0.173/libdw/Makefile.am.orig 2018-07-30 10:45:42.116360700 +0300 ++++ elfutils-0.173/libdw/Makefile.am 2018-07-30 10:46:09.978009700 +0300 +@@ -115,7 +115,6 @@ + # not fly in a setuid executable that links in libdw. + $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ + -Wl,--soname,$@.$(VERSION) \ +- -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ + -Wl,--version-script,$<,--no-undefined \ + -Wl,--whole-archive $(libdw_so_LIBS) -Wl,--no-whole-archive \ + $(libdw_so_LDLIBS) diff --git a/elfutils/PKGBUILD b/elfutils/PKGBUILD index 027a93eb..92d40ee9 100644 --- a/elfutils/PKGBUILD +++ b/elfutils/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Martell Malone pkgname=elfutils -pkgver=0.160 +pkgver=0.173 pkgrel=1 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') @@ -12,14 +12,20 @@ depends=('gcc-libs' 'bzip2') provides=('libelf') replaces=('libelf') conflicts=('libelf') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2) +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2 + 001-libintl-linking.patch + 002-disable-new-dtags-flag.patch) options=('staticlibs') -sha256sums=('SKIP') +sha256sums=('b76d8c133f68dad46250f5c223482c8299d454a69430d9aa5c19123345a000ff' + '5078201680c7626f3d60c882d3088a5bf4d74c61101f90d54f882bb998f7c47e' + '8e0745d32f85b1cc2bb6b117bce1fdb9d4a4a22a76a16aaf9803ccd33270e45b') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - rm -f config.guess config.sub - automake -a || true + patch -p1 -i ${srcdir}/001-libintl-linking.patch + patch -p1 -i ${srcdir}/002-disable-new-dtags-flag.patch + #rm -f config.guess config.sub + #automake -a || true autoreconf -fi } @@ -27,12 +33,17 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} CFLAGS+=" -g" # required for test-suite success - ./configure --prefix=/usr --program-prefix="eu-" + ./configure \ + --prefix=/usr \ + --build=${CHOST} \ + --enable-shared \ + --disable-symbol-versioning \ + --program-prefix="eu-" make } package() { cd ${srcdir}/${_realname}-${pkgver} - make install instroot="${pkgdir}" + make DESTDIR="${pkgdir}" install }