Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=971d69970177ca94aef77b29da3b387d788fb551

commit 971d69970177ca94aef77b29da3b387d788fb551
Author: crazy <[EMAIL PROTECTED]>
Date:   Sun Mar 9 21:34:17 2008 +0100

db-4.6.21-2-i686
* rebuild
* removed the java part from FrugalBuild
* added missing Fdie's

diff --git a/source/base/db/FrugalBuild b/source/base/db/FrugalBuild
index 4a7c34e..577b7c7 100644
--- a/source/base/db/FrugalBuild
+++ b/source/base/db/FrugalBuild
@@ -3,25 +3,16 @@

pkgname=db
pkgver=4.6.21
-pkgrel=1
+pkgrel=2
pkgdesc="The Berkeley DB embedded database system"
url="http://www.sleepycat.com";
-# maybe later we can enable java for i686 & x86_64
-ENABLE_JAVA=${ENABLE_JAVA:-0}
-if [ "$ENABLE_JAVA" = "1" ]; then
-       Finclude java
-       makedepends=([EMAIL PROTECTED] 'java-gcj-compat')
-fi
-depends=('libstdc++')
+depends=('libstdc++>=4.3.0-3')
groups=('base' 'chroot-core')
archs=('i686' 'x86_64' 'ppc')
up2date="lynx -dump 
http://www.oracle.com/technology/software/products/berkeley-db/index.html|grep 
'\]Berkeley DB'|sed 's/.*DB \([^ ]*\) .*/\1/;q'"
-source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz \
-       db-4.5.20-java-gcj.patch)
-sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \
-          'c8063bb1e85f0a8d4ed420d43f2e165e6ba625fe')
+source=(http://download.oracle.com/berkeley-db/db-$pkgver.tar.gz)
+sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119')
[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --with-mutex=x86/gcc-assembly"
-[ "$ENABLE_JAVA" = "1" ] && Fconfopts="$Fconfopts --enable-java"

###
# NOTE! Every time you bump this package, perl-berkeleydb needs bumping, too!
@@ -29,31 +20,20 @@ sha1sums=('5be3beb82e42a78ff671a3f5a4c30e5652972119' \

build()
{
-       Fpatchall
-       cd build_unix
+
+       Fcd
+       cd build_unix || Fdie
../dist/configure $Fconfopts --enable-compat185 \
-               --enable-shared --enable-static --enable-cxx
+               --enable-shared --enable-static --enable-cxx || Fdie

make LIBSO_LIBS=-lpthread || return 1

Fmakeinstall

-       Fmkdir /usr/share/java
-       if [ "$ENABLE_JAVA" = "1" ]; then
-               Fmv /usr/lib/db.jar /usr/share/java/
-               # FIXME: Fjar's -Wl,-Bsymbolic causes DatabaseConfig.DEFAULT to 
return null.
-               # Doing just the same thing without -Wl,-Bsymbolic works.
-               cmd="gcj $CFLAGS -fPIC -fjni -findirect-dispatch \
-                       -fno-strict-aliasing -shared -o 
$Fdestdir/usr/lib/libdb.jar.so \
-                       $Fdestdir/usr/share/java/db.jar -L$Fdestdir/usr/lib 
-ldb \
-                       -ldb_java"
-               echo $cmd
-               $cmd || return 1
-       fi
Fmkdir /usr/share/doc/$pkgname-$pkgver
Fmv /usr/docs/* /usr/share/doc/$pkgname-$pkgver/
Frm /usr/docs/
-       cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/
+       cp -a ../docs $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie
}

# optimization ok
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to