sys-libs/db: respect EPREFIX, fixes bug #587520

(cherry picked from commit 6eab44c650e8134e1b3025a197cb77057d2925d5)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3671
This commit is contained in:
Martin Mokrejš
2017-01-27 11:33:30 +01:00
committed by Robin H. Johnson
parent 341fc67220
commit b7bb930838
10 changed files with 92 additions and 92 deletions

View File

@@ -36,7 +36,7 @@ src_compile() {
}
src_install() {
make -C PORT/linux install DESTDIR="${D}" || die
make -C PORT/linux install DESTDIR="${ED}" || die
# binary compat symlink
dosym libdb1.so.2 /usr/$(get_libdir)/libdb.so.2 || die

View File

@@ -84,7 +84,7 @@ src_compile() {
--enable-cxx \
--enable-compat185 \
--enable-dump185 \
--prefix=/usr"
--prefix=${EPREFIX}/usr"
# --enable-rpc DOES NOT BUILD
# Robin H. Johnson <robbat2@gentoo.org> (18 Oct 2003)
@@ -107,17 +107,17 @@ src_compile() {
strip=/bin/true \
ECONF_SOURCE="${S}"/dist econf \
${conf} ${conf_static} \
--libdir=/usr/$(get_libdir) \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-shared \
--enable-static || die
einfo "Configuring ${P} (shared)..."
mkdir -p "${S}"/build-shared
cd "${S}"/build-shared
strip=/bin/true \
strip="${ED}"/bin/true \
ECONF_SOURCE="${S}"/dist econf \
${conf} ${conf_shared} \
--libdir=/usr/$(get_libdir) \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-static \
--enable-shared || die
@@ -125,19 +125,19 @@ src_compile() {
MAKEOPTS="${MAKEOPTS} -j1"
einfo "Building ${P} (static)..."
cd "${S}"/build-static
emake strip=/bin/true || die "Static build failed"
emake strip="${EPREFIX}"/bin/true || die "Static build failed"
einfo "Building ${P} (shared)..."
cd "${S}"/build-shared
emake strip=/bin/true || die "Shared build failed"
emake strip="${EPREFIX}"/bin/true || die "Shared build failed"
}
src_install () {
cd "${S}"/build-shared
make libdb=libdb-3.2.a \
libcxx=libcxx_3.2.a \
prefix="${D}"/usr \
libdir="${D}"/usr/$(get_libdir) \
strip=/bin/true \
prefix="${EPREFIX}"/usr \
libdir="${EPREFIX}"/usr/$(get_libdir) \
strip="${EPREFIX}"/bin/true \
install || die
cd "${S}"/build-static
@@ -153,7 +153,7 @@ src_install () {
# For some reason, db.so's are *not* readable by group or others,
# resulting in no one but root being able to use them!!!
# This fixes it -- DR 15 Jun 2001
cd "${D}"/usr/$(get_libdir)
cd "${ED}"/usr/$(get_libdir)
chmod go+rx *.so
# The .la's aren't readable either
chmod go+r *.la

View File

@@ -113,13 +113,13 @@ src_compile() {
fi
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--prefix="${EPREFIX}"/usr \
--mandir="${EPREFIX}"/usr/share/man \
--infodir="${EPREFIX}"/usr/share/info \
--datadir="${EPREFIX}"/usr/share \
--sysconfdir="${EPREFIX}"/etc \
--localstatedir="${EPREFIX}"/var/lib \
--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
--enable-compat185 \
--with-uniquename \
$(use_enable rpc) \
@@ -135,7 +135,7 @@ src_compile() {
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
db_src_install_usrbinslot
@@ -147,13 +147,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -120,13 +120,13 @@ src_compile() {
fi
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--prefix="${EPREFIX}"/usr \
--mandir="${EPREFIX}"/usr/share/man \
--infodir="${EPREFIX}"/usr/share/info \
--datadir="${EPREFIX}"/usr/share \
--sysconfdir="${EPREFIX}"/etc \
--localstatedir="${EPREFIX}"/var/lib \
--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
@@ -138,7 +138,7 @@ src_compile() {
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
db_src_install_usrbinslot
@@ -150,13 +150,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -114,13 +114,13 @@ src_compile() {
fi
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--prefix="${EPREFIX}"/usr \
--mandir="${EPREFIX}"/usr/share/man \
--infodir="${EPREFIX}"/usr/share/info \
--datadir="${EPREFIX}"/usr/share \
--sysconfdir="${EPREFIX}"/etc \
--localstatedir="${EPREFIX}"/var/lib \
--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
@@ -132,7 +132,7 @@ src_compile() {
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
einstall libdir="${ED}/usr/$(get_libdir)" strip="${ED}/bin/strip" || die
db_src_install_usrbinslot
@@ -144,13 +144,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -124,13 +124,13 @@ src_compile() {
fi
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--prefix="${EPREFIX}"/usr \
--mandir="${EPREFIX}"/usr/share/man \
--infodir="${EPREFIX}"/usr/share/info \
--datadir="${EPREFIX}"/usr/share \
--sysconfdir="${EPREFIX}"/etc \
--localstatedir="${EPREFIX}"/var/lib \
--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
@@ -145,7 +145,7 @@ src_compile() {
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die
db_src_install_usrbinslot
@@ -157,13 +157,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -117,13 +117,13 @@ src_compile() {
fi
cd "${S}" && ECONF_SOURCE="${S}"/../dist econf \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--datadir=/usr/share \
--sysconfdir=/etc \
--localstatedir=/var/lib \
--libdir=/usr/"$(get_libdir)" \
--prefix="${EPREFIX}"/usr \
--mandir="${EPREFIX}"/usr/share/man \
--infodir="${EPREFIX}"/usr/share/info \
--datadir="${EPREFIX}"/usr/share \
--sysconfdir="${EPREFIX}"/etc \
--localstatedir="${EPREFIX}"/var/lib \
--libdir="${EPREFIX}"/usr/"$(get_libdir)" \
--enable-compat185 \
--enable-o_direct \
--without-uniquename \
@@ -138,7 +138,7 @@ src_compile() {
}
src_install() {
einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
einstall libdir="${ED}/usr/$(get_libdir)" STRIP="true" || die
db_src_install_usrbinslot
@@ -150,13 +150,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -141,13 +141,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}

View File

@@ -153,9 +153,9 @@ multilib_src_install() {
db_src_install_usrlibcleanup
if multilib_is_native_abi && use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}
@@ -166,9 +166,9 @@ multilib_src_install_all() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
if [[ -f "${D}"/usr/bin/berkeley_db_svc ]] ; then
mv "${D}"/usr/bin/berkeley_db_svc \
"${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
if [[ -f "${ED}"/usr/bin/berkeley_db_svc ]] ; then
mv "${ED}"/usr/bin/berkeley_db_svc \
"${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc || die
fi
}

View File

@@ -170,13 +170,13 @@ src_install() {
dodir /usr/sbin
# This file is not always built, and no longer exists as of db-4.8
[[ -f "${D}"/usr/bin/berkeley_db_svc ]] && \
mv "${D}"/usr/bin/berkeley_db_svc "${D}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
[[ -f "${ED}"/usr/bin/berkeley_db_svc ]] && \
mv "${ED}"/usr/bin/berkeley_db_svc "${ED}"/usr/sbin/berkeley_db"${SLOT/./}"_svc
if use java; then
java-pkg_regso "${D}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${D}"/usr/"$(get_libdir)"/*.jar
rm -f "${D}"/usr/"$(get_libdir)"/*.jar
java-pkg_regso "${ED}"/usr/"$(get_libdir)"/libdb_java*.so
java-pkg_dojar "${ED}"/usr/"$(get_libdir)"/*.jar
rm -f "${ED}"/usr/"$(get_libdir)"/*.jar
fi
}