mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sys-libs/db: Fixed regressions introduced by commit a429a28d
Closes: https://bugs.gentoo.org/699940 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
@@ -53,7 +53,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x/6.x
|
||||
|
||||
@@ -42,8 +42,8 @@ PATCHES=(
|
||||
"${FILESDIR}"/"${PN}"-"${SLOT}"-libtool.patch
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
|
||||
)
|
||||
|
||||
# Required to avoid unpack attempt of patches
|
||||
|
||||
@@ -41,8 +41,8 @@ PATCHES=(
|
||||
"${FILESDIR}"/"${PN}"-4.4-libtool.patch
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/"${PN}"-4.3-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
|
||||
)
|
||||
|
||||
# Required to avoid unpack attempt of patches
|
||||
|
||||
@@ -42,7 +42,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/"${PN}"-"${SLOT}"-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
|
||||
)
|
||||
|
||||
# Required to avoid unpack attempt of patches
|
||||
|
||||
@@ -41,11 +41,11 @@ RDEPEND="tcl? ( dev-lang/tcl )
|
||||
java? ( >=virtual/jre-1.5 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/"${PN}"-4.6-libtool.patch
|
||||
"${FILESDIR}"/"${PN}"-4.4-libtool.patch
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/"${PN}"-4.6-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/"${PN}"-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/"${PN}"-4.2-listen-to-java-options.patch
|
||||
)
|
||||
|
||||
# Required to avoid unpack attempt of patches
|
||||
|
||||
@@ -49,7 +49,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -48,7 +48,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# upstream autoconf fails to build DBM when it's supposed to
|
||||
# merged upstream in 5.0.26
|
||||
|
||||
@@ -58,7 +58,7 @@ src_prepare() {
|
||||
|
||||
# use the includes from the prefix
|
||||
epatch "${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x
|
||||
|
||||
@@ -52,7 +52,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x
|
||||
@@ -88,7 +88,7 @@ src_prepare() {
|
||||
# This supersedes the unused jarlocation patches.
|
||||
sed -r \
|
||||
-e '/jarfile=.*\.jar$/s,(.jar$),-$(LIBVERSION)\1,g' \
|
||||
dist/Makefile.in || die
|
||||
-i dist/Makefile.in || die
|
||||
|
||||
cd dist || die
|
||||
rm aclocal/libtool.m4 || die
|
||||
|
||||
@@ -52,7 +52,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-4.6-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x/6.x
|
||||
|
||||
@@ -52,7 +52,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-6.2-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x/6.x
|
||||
|
||||
@@ -52,7 +52,7 @@ PATCHES=(
|
||||
|
||||
# use the includes from the prefix
|
||||
"${FILESDIR}"/${PN}-6.2.32-jni-check-prefix-first.patch
|
||||
"${FILESDIR}"/${PN}-4.3-listen-to-java-options.patch
|
||||
"${FILESDIR}"/${PN}-4.2-listen-to-java-options.patch
|
||||
|
||||
# sqlite configure call has an extra leading ..
|
||||
# upstreamed:5.2.36, missing in 5.3.x/6.x
|
||||
|
||||
Reference in New Issue
Block a user