diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /sys-libs/db/files | |
parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) |
gentoo resync : 18.11.2019
Diffstat (limited to 'sys-libs/db/files')
-rw-r--r-- | sys-libs/db/files/db-4.3-jni-check-prefix-first.patch | 30 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.3-listen-to-java-options.patch | 10 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.5-libtool.patch | 47 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.6-libtool.patch | 47 |
4 files changed, 0 insertions, 134 deletions
diff --git a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch deleted file mode 100644 index 0777c706d0bf..000000000000 --- a/sys-libs/db/files/db-4.3-jni-check-prefix-first.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/dist/aclocal_java/ac_jni_include_dirs.ac -+++ b/dist/aclocal_java/ac_jni_include_dirs.ac -@@ -43,14 +43,19 @@ - *) AC_MSG_ERROR([$_ACJNI_JAVAC is not an absolute path name]);; - esac - --_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") --_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` --case "$host_os" in -- darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -- _JINC="$_JTOPDIR/Headers";; -- *) _JINC="$_JTOPDIR/include";; --esac -- -+# If JAVAPREFIX is defined, look there first -+if test -r "$JAVAPREFIX/include/jni.h"; then -+ _JTOPDIR="$JAVAPREFIX" -+ _JINC="$JAVAPREFIX/include" -+else -+ _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") -+ _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` -+ case "$host_os" in -+ darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` -+ _JINC="$_JTOPDIR/Headers";; -+ *) _JINC="$_JTOPDIR/include";; -+ esac -+fi - # If we find jni.h in /usr/include, then it's not a java-only tree, so - # don't add /usr/include or subdirectories to the list of includes. - # An extra -I/usr/include can foul things up with newer gcc's. diff --git a/sys-libs/db/files/db-4.3-listen-to-java-options.patch b/sys-libs/db/files/db-4.3-listen-to-java-options.patch deleted file mode 100644 index f1f701de1261..000000000000 --- a/sys-libs/db/files/db-4.3-listen-to-java-options.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/dist/configure.ac -+++ b/dist/configure.ac -@@ -385,6 +385,7 @@ - # A classpath that includes . is needed to check for Java - CLASSPATH=".:$CLASSPATH" - export CLASSPATH -+ AC_JAVA_OPTIONS - AC_PROG_JAVAC - AC_PROG_JAR - AC_PROG_JAVA diff --git a/sys-libs/db/files/db-4.5-libtool.patch b/sys-libs/db/files/db-4.5-libtool.patch deleted file mode 100644 index b4d2fc8d73cf..000000000000 --- a/sys-libs/db/files/db-4.5-libtool.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/dist/configure -+++ b/dist/configure -@@ -5765,7 +5765,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -8753,7 +8753,7 @@ - whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -11855,7 +11855,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -15842,7 +15842,7 @@ - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -18300,7 +18300,7 @@ - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sys-libs/db/files/db-4.6-libtool.patch b/sys-libs/db/files/db-4.6-libtool.patch deleted file mode 100644 index b4d2fc8d73cf..000000000000 --- a/sys-libs/db/files/db-4.6-libtool.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/dist/configure -+++ b/dist/configure -@@ -5765,7 +5765,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -8753,7 +8753,7 @@ - whole_archive_flag_spec= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -11855,7 +11855,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # I'd rather use --version here, but apparently some GNU lds only accept -v. --case `$LD -v 2>&1 </dev/null` in -+case `"$LD" -v 2>&1 </dev/null` in - *GNU* | *'with BFD'*) - lt_cv_prog_gnu_ld=yes - ;; -@@ -15842,7 +15842,7 @@ - whole_archive_flag_spec_F77= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -@@ -18300,7 +18300,7 @@ - whole_archive_flag_spec_GCJ= - fi - supports_anon_versioning=no -- case `$LD -v 2>/dev/null` in -+ case `"$LD" -v 2>/dev/null` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... |