summaryrefslogtreecommitdiffstats
path: root/base/jdk/Pkgfile
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-08-24 23:50:57 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-08-24 23:50:57 +0200
commit1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab (patch)
tree4dab934e579eb1eacc2f2b68ca09f02a4d468335 /base/jdk/Pkgfile
parent387c39c97a2a6210c27bb82d8c0c86edc3a49869 (diff)
downloadnutyx-extra-1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab.tar.gz
nutyx-extra-1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab.tar.bz2
nutyx-extra-1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab.tar.xz
nutyx-extra-1d0b213e3ae52aad3d8de7d54f8333b201bdb6ab.zip
jdk, maj pour la 64 bits
Diffstat (limited to 'base/jdk/Pkgfile')
-rw-r--r--base/jdk/Pkgfile18
1 files changed, 12 insertions, 6 deletions
diff --git a/base/jdk/Pkgfile b/base/jdk/Pkgfile
index 471bf40ad..9d1c39850 100644
--- a/base/jdk/Pkgfile
+++ b/base/jdk/Pkgfile
@@ -7,21 +7,27 @@
name=jdk
version=6u14
release=1
-source=(http://www.nutyx.org/files/$name-$version-linux-i586.bin \
+[ "`uname -m`" == "i686" ] && _ARCH=i586
+[ "`uname -m`" == "x86_64" ] && _ARCH=amd64
+
+source=(http://download.java.net/dlj/binaries/$name-$version-dlj-linux-${_ARCH}.bin \
jdk.sh )
build() {
mkdir -p $PKG/etc/profile.d/
mv jdk.sh $PKG/etc/profile.d/
- chmod 755 $name-$version-linux-i586.bin
- ./jdk-$version-linux-i586.bin
+ chmod 755 $name-$version-dlj-linux-${_ARCH}.bin
+ ./jdk-$version-dlj-linux-${_ARCH}.bin
cd jdk1.6.0_14
install -v -m755 -d $PKG/opt/jdk-bin-$version
mv -v * $PKG/opt/jdk-bin-$version
- ln -v -sf xawt/libmawt.so \
- $PKG/opt/jdk-bin-$version/jre/lib/i386/
+if [ "`uname -m`" == "i686" ]; then
+ _ARCH=i386
+fi
+ ln -v -sf xawt/libmawt.so \
+ $PKG/opt/jdk-bin-$version/jre/lib/${_ARCH}/
sed -i 's@XINERAMA@FAKEEXTN@g' \
- $PKG/opt/jdk-bin-$version/jre/lib/i386/xawt/libmawt.so
+ $PKG/opt/jdk-bin-$version/jre/lib/${_ARCH}/xawt/libmawt.so
ln -v -nsf jdk-bin-$version $PKG/opt/jdk
}