Author: peroyvind
Date: Sat Feb 3 12:15:56 2007
New Revision: 116065
Added:
packages/cooker/db43/current/SOURCES/db-4.3.29-dont-messup-gcj-headers.patch
Modified:
packages/cooker/db43/current/SPECS/db43.spec
Log:
fix build with gcj (P6)
build java api
update buildrequires
drop useless /sbin/ldconfig depency
Added:
packages/cooker/db43/current/SOURCES/db-4.3.29-dont-messup-gcj-headers.patch
==============================================================================
--- (empty file)
+++
packages/cooker/db43/current/SOURCES/db-4.3.29-dont-messup-gcj-headers.patch
Sat Feb 3 12:15:56 2007
@@ -0,0 +1,46 @@
+--- db-4.3.29/dist/configure~ 2007-02-03 11:35:08.000000000 +0100
++++ db-4.3.29/dist/configure 2007-02-03 11:38:33.000000000 +0100
+@@ -23434,20 +23434,6 @@ else
+ fi
+ fi
+
+-# get the likely subdirectories for system specific java includes
+-if test "$_JTOPDIR" != "/usr"; then
+- case "$host_os" in
+- aix*) _JNI_INC_SUBDIRS="aix";;
+- bsdi*) _JNI_INC_SUBDIRS="bsdos";;
+- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
+- hp*) _JNI_INC_SUBDIRS="hp-ux";;
+- linux*) _JNI_INC_SUBDIRS="linux genunix";;
+- osf*) _JNI_INC_SUBDIRS="alpha";;
+- solaris*) _JNI_INC_SUBDIRS="solaris";;
+- *) _JNI_INC_SUBDIRS="genunix";;
+- esac
+-fi
+-
+ # add any subdirectories that are present
+ for _JINCSUBDIR in $_JNI_INC_SUBDIRS
+ do
+--- db-4.3.29/dist/aclocal_java/ac_jni_include_dirs.ac~ 2003-10-05
20:10:06.000000000 +0200
++++ db-4.3.29/dist/aclocal_java/ac_jni_include_dirs.ac 2007-02-03
12:07:33.000000000 +0100
+@@ -70,20 +70,6 @@ else
+ fi
+ fi
+
+-# get the likely subdirectories for system specific java includes
+-if test "$_JTOPDIR" != "/usr"; then
+- case "$host_os" in
+- aix*) _JNI_INC_SUBDIRS="aix";;
+- bsdi*) _JNI_INC_SUBDIRS="bsdos";;
+- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
+- hp*) _JNI_INC_SUBDIRS="hp-ux";;
+- linux*) _JNI_INC_SUBDIRS="linux genunix";;
+- osf*) _JNI_INC_SUBDIRS="alpha";;
+- solaris*) _JNI_INC_SUBDIRS="solaris";;
+- *) _JNI_INC_SUBDIRS="genunix";;
+- esac
+-fi
+-
+ # add any subdirectories that are present
+ for _JINCSUBDIR in $_JNI_INC_SUBDIRS
+ do
Modified: packages/cooker/db43/current/SPECS/db43.spec
==============================================================================
--- packages/cooker/db43/current/SPECS/db43.spec (original)
+++ packages/cooker/db43/current/SPECS/db43.spec Sat Feb 3 12:15:56 2007
@@ -21,7 +21,7 @@
%{?!mdkversion:%define mdkversion %(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/;
$_="$1$2".($3||0)' /etc/mandrake-release)}
# Define to build Java bindings (does not work)
-%define build_java 0
+%define build_java 1
# Allow --with[out] JAVA rpm command line build
%{?_with_JAVA: %{expand: %%define build_java 1}}
@@ -49,13 +49,12 @@
Summary: The Berkeley DB database library for C
Name: db43
Version: 4.3.29
-Release: %mkrel 2
+Release: %mkrel 3
Source: ftp://sleepycat1.inetu.net/releases/db-%{version}.tar.bz2
URL: http://www.sleepycat.com
License: BSD
Group: System/Libraries
-Requires(pre): /sbin/ldconfig
-BuildRequires: tcl, db1-devel,ed
+BuildRequires: tcl-devel db1-devel ed
%if %{mdkversion} >= 900
BuildRequires: glibc-static-devel
%endif
@@ -71,7 +70,8 @@
Patch4: db-4.2.52-db185.patch.bz2
# Fix broken built-in libtool 1.5
Patch5: db-4.3.21-libtool-fixes.patch.bz2
-
+# Don't try add headers that confuses gcj
+Patch6: db-4.3.29-dont-messup-gcj-headers.patch
BuildRoot: %{_tmppath}/%{name}-root
%description
@@ -83,7 +83,6 @@
%package -n %{libname}
Summary: The Berkeley DB database library for C
Group: System/Libraries
-Requires(pre): /sbin/ldconfig
%description -n %{libname}
The Berkeley Database (Berkeley DB) is a programmatic toolkit that provides
@@ -94,7 +93,6 @@
%package -n %{libdbcxx}
Summary: The Berkeley DB database library for C++
Group: System/Libraries
-Requires(pre): /sbin/ldconfig
#Provides: libdbcxx = %{version}-%{release}
%description -n %{libdbcxx}
@@ -109,7 +107,6 @@
%package -n %{libdbjava}
Summary: The Berkeley DB database library for C++
Group: System/Libraries
-Requires(pre): /sbin/ldconfig
#Provides: libdbjava = %{version}-%{release}
%description -n %{libdbjava}
@@ -124,7 +121,6 @@
%package -n %{libdbtcl}
Summary: The Berkeley DB database library for TCL
Group: System/Libraries
-Requires(pre): /sbin/ldconfig
#Provides: libdbtcl = %{version}-%{release}
%description -n %{libdbtcl}
@@ -241,6 +237,7 @@
%patch3 -p1 -b .amd64-mutexes
%patch4 -p1 -b .db185
%patch5 -p1 -b .libtool-fixes
+%patch6 -p1 -b .gcj_fix
# Remove tags files which we don't need.
find . -name tags | xargs rm -f
@@ -292,31 +289,6 @@
export CFLAGS
%if %{build_java}
-# Use javac trampoline from gcj
-mkdir -p build_unix/gcj
-pushd build_unix/gcj;
-cat > jar << EOF
-#!/bin/sh
-exec /usr/bin/gcj-jar-`gcj -dumpversion` "\$@"
-EOF
-chmod +x jar
-cat > javac << EOF
-#!/bin/sh
-exec /usr/bin/gcj-javac-`gcj -dumpversion` "\$@"
-EOF
-chmod +x javac
-cat > java << EOF
-#!/bin/sh
-echo 'fake version "1.3.1"'
-EOF
-chmod +x java
-export PATH=$PWD:$PATH
-# Kludge lookup of <jni.h> and make configure grab the right one from gcj
-ln -s `gcj -print-file-name=include`/libgcj include
-popd
-%endif
-
-%if %{build_java}
ENABLE_JAVA="--enable-java"
%endif
