From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- app-arch/rpm/files/rpm-4.16.1.3-libdir.patch | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 app-arch/rpm/files/rpm-4.16.1.3-libdir.patch (limited to 'app-arch/rpm/files') diff --git a/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch new file mode 100644 index 000000000000..a2c95ff064e2 --- /dev/null +++ b/app-arch/rpm/files/rpm-4.16.1.3-libdir.patch @@ -0,0 +1,34 @@ +diff -uNr rpm-4.16.1.3.ORIG/configure.ac rpm-4.16.1.3/configure.ac +--- rpm-4.16.1.3.ORIG/configure.ac 2021-04-13 19:32:35.630955569 +0100 ++++ rpm-4.16.1.3/configure.ac 2021-04-13 19:32:54.939623251 +0100 +@@ -957,13 +957,7 @@ + AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory]) + AC_SUBST(RUNDIR) + +-if test X"$prefix" = XNONE ; then +- usrprefix="$ac_default_prefix" +-else +- usrprefix=$prefix +-fi +- +-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" ++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`" + AC_SUBST(RPMCONFIGDIR) + + AC_SUBST(OBJDUMP) +diff -uNr rpm-4.16.1.3.ORIG/rpm.am rpm-4.16.1.3/rpm.am +--- rpm-4.16.1.3.ORIG/rpm.am 2021-04-13 19:32:35.584956361 +0100 ++++ rpm-4.16.1.3/rpm.am 2021-04-13 19:32:54.940623234 +0100 +@@ -1,10 +1,8 @@ + # Internal binaries +-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm +-rpmlibexecdir = $(prefix)/lib/rpm ++rpmlibexecdir = $(pkglibexecdir) + + # Host independent config files +-## HACK: it probably should be $(datadir)/rpm +-rpmconfigdir = $(prefix)/lib/rpm ++rpmconfigdir = $(pkglibexecdir) + + # Libtool version (current-revision-age) for all our libraries + rpm_version_info = 10:3:1 -- cgit v1.2.3