summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2011-03-26 23:18:04 +0000
committerTimo Teras <timo.teras@iki.fi>2011-03-26 23:18:42 +0000
commit14df56692bad7f3aa5d6f9eea798930d15e1b842 (patch)
tree5d0b31363b3195dfb16654a9368b4f63f25428fc /testing
parent747f87be523e41dc48e026c813b013e30334f79f (diff)
downloadaports-14df56692bad7f3aa5d6f9eea798930d15e1b842.tar.bz2
aports-14df56692bad7f3aa5d6f9eea798930d15e1b842.tar.xz
testing/java*: java uses amd64 instead of x86_64
Diffstat (limited to 'testing')
-rw-r--r--testing/java-gcj-compat/APKBUILD2
-rw-r--r--testing/openjdk6/APKBUILD2
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/java-gcj-compat/APKBUILD b/testing/java-gcj-compat/APKBUILD
index bf0985496..627f7b7ff 100644
--- a/testing/java-gcj-compat/APKBUILD
+++ b/testing/java-gcj-compat/APKBUILD
@@ -36,7 +36,7 @@ package() {
JRE_BIN_DIR=$JRE_DIR/bin
JRE_LIB_DIR=$JRE_DIR/lib
- CPU=$(uname -m | sed -e 's/i.86/i386/g')
+ CPU=$(uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g')
mkdir -p $JDK_BIN_DIR
ln -sf ../../../../bin/gij $JDK_BIN_DIR/java
diff --git a/testing/openjdk6/APKBUILD b/testing/openjdk6/APKBUILD
index e38aa9edf..b72630bdc 100644
--- a/testing/openjdk6/APKBUILD
+++ b/testing/openjdk6/APKBUILD
@@ -44,7 +44,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-
_builddir="$srcdir/icedtea6-$icedteaver"
INSTALL_BASE=/usr/lib/jvm/java-1.6-openjdk
-CPU=`uname -m | sed -e 's/i.86/i386/g'`
+CPU=`uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g'`
unpack() {
if [ -z "$force" ]; then