diff options
author | Caleb Tennis <caleb@gentoo.org> | 2007-08-15 12:17:11 +0000 |
---|---|---|
committer | Caleb Tennis <caleb@gentoo.org> | 2007-08-15 12:17:11 +0000 |
commit | 2588ae4aad77c2da18c8c830d0833302e4755e62 (patch) | |
tree | 02f9fe15b6b7c68f36f8b88f20f63ec1ad43fd08 /sys-libs/db/files | |
parent | Add sys-libs/db-4.6 to package.mask for now (diff) | |
download | gentoo-2-2588ae4aad77c2da18c8c830d0833302e4755e62.tar.gz gentoo-2-2588ae4aad77c2da18c8c830d0833302e4755e62.tar.bz2 gentoo-2-2588ae4aad77c2da18c8c830d0833302e4755e62.zip |
Next major revision of db. package.mask'd for now for further testing
(Portage version: 2.1.3.5)
Diffstat (limited to 'sys-libs/db/files')
-rw-r--r-- | sys-libs/db/files/db-4.6-jarlocation.patch | 16 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.6-jni-check-prefix-first.patch | 30 | ||||
-rw-r--r-- | sys-libs/db/files/db-4.6-libtool.patch | 47 | ||||
-rw-r--r-- | sys-libs/db/files/digest-db-4.6.18 | 3 |
4 files changed, 96 insertions, 0 deletions
diff --git a/sys-libs/db/files/db-4.6-jarlocation.patch b/sys-libs/db/files/db-4.6-jarlocation.patch new file mode 100644 index 000000000000..c0d689f43691 --- /dev/null +++ b/sys-libs/db/files/db-4.6-jarlocation.patch @@ -0,0 +1,16 @@ +diff -ur db-4.1.25.old/dist/Makefile.in db-4.1.25/dist/Makefile.in +--- db-4.1.25.old/dist/Makefile.in 2003-10-18 02:15:45.000000000 -0700 ++++ db-4.1.25/dist/Makefile.in 2003-10-18 02:13:47.000000000 -0700 +@@ -107,9 +107,9 @@ + JAVA_EXDIR= $(JAVA_SRCDIR)/$(JAVA_EXREL) + JAVA_RPCDIR= $(srcdir)/rpc_server/java + +-libj_jarfile= db.jar +-libj_exjarfile= dbexamples.jar +-rpc_jarfile= dbsvc.jar ++libj_jarfile= db-4.4.jar ++libj_exjarfile= dbexamples-4.4.jar ++rpc_jarfile= dbsvc-4.4.jar + libjso_base= libdb_java + libjso= $(libjso_base)-$(SOVERSION).@JMODSUFFIX@ + libjso_static= $(libjso_base)-$(SOVERSION).a diff --git a/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch new file mode 100644 index 000000000000..63735e62469f --- /dev/null +++ b/sys-libs/db/files/db-4.6-jni-check-prefix-first.patch @@ -0,0 +1,30 @@ +--- dist/aclocal_java/ac_jni_include_dirs.m4 2003-10-06 20:41:38.000000000 +0200 ++++ dist/aclocal_java/ac_jni_include_dirs.m4 2005-09-23 21:31:26.000000000 +0200 +@@ -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.6-libtool.patch b/sys-libs/db/files/db-4.6-libtool.patch new file mode 100644 index 000000000000..3d86b88f86b3 --- /dev/null +++ b/sys-libs/db/files/db-4.6-libtool.patch @@ -0,0 +1,47 @@ +--- dist/configure.orig 2006-01-31 10:23:58.000000000 +0100 ++++ dist/configure 2006-01-31 10:26:43.000000000 +0100 +@@ -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/digest-db-4.6.18 b/sys-libs/db/files/digest-db-4.6.18 new file mode 100644 index 000000000000..546b0c4fcc5c --- /dev/null +++ b/sys-libs/db/files/digest-db-4.6.18 @@ -0,0 +1,3 @@ +MD5 95768bd92fd48951a427fbab37b9088f db-4.6.18.tar.gz 12017762 +RMD160 ea6e6e7d06ab546ce6cbca2091f02566849eaff8 db-4.6.18.tar.gz 12017762 +SHA256 5fc03231ce2d1ac68480fce9821e91d85f132104dc1e16ab7edb6476b2353ef3 db-4.6.18.tar.gz 12017762 |