Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=f14c4f08a2bb9a4f9cae66c3090479506e4dd896
commit f14c4f08a2bb9a4f9cae66c3090479506e4dd896 Author: DeX77 <[email protected]> Date: Tue Jun 17 19:15:56 2014 +0200 openjdk-7-14-x86_64 * relbump + added java libs to ldpath diff --git a/source/devel-extra/openjdk/FrugalBuild b/source/devel-extra/openjdk/FrugalBuild index b731d8b..5faca76 100644 --- a/source/devel-extra/openjdk/FrugalBuild +++ b/source/devel-extra/openjdk/FrugalBuild @@ -8,7 +8,7 @@ _updatever=u45 pkgver=7 icedteaver=2.4.5 javaver="$pkgver-openjdk" -pkgrel=13 +pkgrel=14 pkgdesc="Open-source Java Development Kit implementation." url="http://openjdk.java.net/"; depends=('libx11' 'krb5') @@ -106,6 +106,25 @@ build() Fsplit openjre usr/lib/jvm/java-$javaver/jre \ etc/profile.d/openjre.sh Fsplit openjdk-source usr/lib/jvm/java-$javaver/src.zip + + + # Add ld.so.conf.d entry + Fmkdir "etc/ld.so.conf.d" + + if [ $CARCH = x86_64 ]; then + echo /usr/lib/jvm/java-7-openjdk/jre/lib/amd64 >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/amd64/xawt >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/amd64/jli >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/amd64/server >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/amd64/headless >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + else + echo /usr/lib/jvm/java-7-openjdk/jre/lib/i386 >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/i386/xawt >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/i386/jli >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/i386/server >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + echo /usr/lib/jvm/java-7-openjdk/jre/lib/i386/headless >> "$Fdestdir/etc/ld.so.conf.d/openjdk.conf" || Fdie + fi + } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
