diff options
| author | Ørjan Malde <red@foxi.me> | 2021-09-10 20:18:59 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2021-09-10 20:18:59 +0200 |
| commit | c35c0e8ee010d2f085272202ad0360ab94bf9233 (patch) | |
| tree | 57815c451673a364ecbd64fc00a01cfd42a38e67 | |
| parent | 28edd97a59fff773367b050bad52d36d6dc18fad (diff) | |
| download | midipix_build-c35c0e8ee010d2f085272202ad0360ab94bf9233.tar.bz2 midipix_build-c35c0e8ee010d2f085272202ad0360ab94bf9233.tar.xz | |
groups/020.host_deps_rpm.group: rpm_host: disable libelf support
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups/020.host_deps_rpm.group | 3 | ||||
| -rw-r--r-- | patches/rpm_host-4.16.0_pre.local.patch | 53 |
2 files changed, 55 insertions, 1 deletions
diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group index 73f7e903..67f018ca 100644 --- a/groups/020.host_deps_rpm.group +++ b/groups/020.host_deps_rpm.group @@ -27,11 +27,12 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}"; : ${PKG_RPM_HOST_VERSION:=4.16.0}; : ${PKG_RPM_HOST_URL:=http://ftp.rpm.org/releases/rpm-${PKG_RPM_HOST_VERSION%.*}.x/rpm-${PKG_RPM_HOST_VERSION}.tar.bz2}; : ${PKG_RPM_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include -I${PREFIX}/include/dbus-1.0 -I${PREFIX}/lib/dbus-1.0/include"}; -: ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --with-crypto=openssl --with-vendor=midipix --without-lua"}; +: ${PKG_RPM_HOST_CONFIGURE_ARGS_EXTRA:="--enable-bdb=no --enable-ndb --with-crypto=openssl --with-vendor=midipix --without-lua --disable-libelf"}; : ${PKG_RPM_HOST_INSTALL_FILES_V2:=" +%[_files]/lib/rpm/elfdeps=lib/rpm/elfdeps m0755=lib/rpm/elfdeps -=var/%<*>"}; : ${PKG_RPM_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"}; +: ${PKG_RPM_HOST_FORCE_AUTORECONF:=1}; # vim:filetype=sh textwidth=0 diff --git a/patches/rpm_host-4.16.0_pre.local.patch b/patches/rpm_host-4.16.0_pre.local.patch new file mode 100644 index 00000000..40eaa2b0 --- /dev/null +++ b/patches/rpm_host-4.16.0_pre.local.patch @@ -0,0 +1,53 @@ +--- rpm-4.17.0/configure.ac 2021-09-03 11:42:16.790237970 +0200 ++++ rpm-4.17.0.new/configure.ac 2021-09-10 17:53:28.904112791 +0200 +@@ -248,14 +248,22 @@ + + #================= + # Check for libelf library. Prefer external, otherwise none. +-WITH_LIBELF_LIB= +-AC_CHECK_HEADER([libelf.h]) +-AC_CHECK_HEADERS([gelf.h], [ +- AC_CHECK_LIB(elf, gelf_getvernaux, [ +- AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) +- WITH_LIBELF_LIB="-lelf" +- WITH_LIBELF=yes +- ]) ++AC_ARG_ENABLE([libelf], ++ [AS_HELP_STRING([--enable-libelf=@<:@yes/no/auto@:>@], ++ [build with libelf support (default=yes)])], ++ [enable_libelf="$enableval"], ++ [enable_libelf=yes]) ++ ++AS_IF([test "x$enable_libelf" != "xno"], [ ++ WITH_LIBELF_LIB= ++ AC_CHECK_HEADER([libelf.h]) ++ AC_CHECK_HEADERS([gelf.h], [ ++ AC_CHECK_LIB(elf, gelf_getvernaux, [ ++ AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have the 'elf' library (-lelf).]) ++ WITH_LIBELF_LIB="-lelf" ++ WITH_LIBELF=yes ++ ]) ++ ]) + ]) + AC_SUBST(WITH_LIBELF_LIB) + AM_CONDITIONAL(LIBELF,[test "$WITH_LIBELF" = yes]) +diff -ru rpm-4.16.0.orig/configure.ac rpm-4.16.0/configure.ac +--- rpm-4.16.0.orig/configure.ac 2021-09-10 20:08:26.243318920 +0200 ++++ rpm-4.16.0/configure.ac 2021-09-10 20:11:20.091320179 +0200 +@@ -498,6 +498,8 @@ + + #================= + # Check for elfutils libdw library with dwelf_elf_gnu_build_id. ++AS_IF([test "x$enable_libelf" != "xno"], [ ++ + WITH_LIBDW_LIB= + HAVE_LIBDW_STRTAB= + AS_IF([test "$WITH_LIBELF" = yes],[ +@@ -518,6 +520,7 @@ + ]) + ]) + ]) ++]) + AC_SUBST(WITH_LIBDW_LIB) + AM_CONDITIONAL(LIBDW,[test "$WITH_LIBDW" = yes]) + AM_CONDITIONAL(HAVE_LIBDW_STRTAB,[test "$HAVE_LIBDW_STRTAB" = yes]) |