summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-05-09 19:05:37 +0200
committer Eric Hameleers <alien@slackware.com>2013-05-09 19:05:37 +0200
commitbee61430a6daecf2bd065518ce275c9d5d377440 (patch)
tree39e86a146001f5f470aabdb7abba4535b93e99a2
parent407dee2252a570a87767360702f12130fcd62343 (diff)
downloadalienarm-bee61430a6daecf2bd065518ce275c9d5d377440.tar.gz
alienarm-bee61430a6daecf2bd065518ce275c9d5d377440.tar.xz
OPENJDK: use "LIB_ARCH=arm" for all ARM architectures.
This fixes the broken '/usr/lib/libjvm.so' symlink and also fixes the copying and back-linking of several files in /etc/java . Thanks to Ahau for reporting this.
-rwxr-xr-xsource.local/l/openjdk/openjdk.SlackBuild4
1 files changed, 2 insertions, 2 deletions
diff --git a/source.local/l/openjdk/openjdk.SlackBuild b/source.local/l/openjdk/openjdk.SlackBuild
index 8590f5a..db79e7d 100755
--- a/source.local/l/openjdk/openjdk.SlackBuild
+++ b/source.local/l/openjdk/openjdk.SlackBuild
@@ -91,12 +91,12 @@ elif [ "$ARCH" = "x86_64" ]; then
elif [ "$ARCH" = "arm" ]; then
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
- LIB_ARCH=$ARCH
+ LIB_ARCH=arm
ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}"
elif [ "$ARCH" = "armv7hl" ]; then
SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
LIBDIRSUFFIX=""
- LIB_ARCH=$ARCH
+ LIB_ARCH=arm
ARCH_OPTS="--enable-jamvm --with-jamvm-src-zip=$CWD/sources/${SRC_JAMVM}"
else
SLKCFLAGS="-O2"