From 7eea90d66dd1bd570723ab4d981880ecfbad265c Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 2 Jan 2012 19:07:36 -0600 Subject: migrate JAVALIB out of set_soenv.in --- config_host.mk.in | 1 + configure.in | 238 ++++++++++++++++++++++++++++++++++++++++++- set_soenv.in | 294 +----------------------------------------------------- 3 files changed, 241 insertions(+), 292 deletions(-) diff --git a/config_host.mk.in b/config_host.mk.in index 75cce05fc974..a6d7c84072a9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -165,6 +165,7 @@ export INPATH_FOR_BUILD="@INPATH_FOR_BUILD@" export INSTALLDIR="@INSTALLDIR@" export INSTALLDIRNAME="@INSTALLDIRNAME@" export INTRO_BIPMAP="@INTRO_BITMAP@" +@x_JAVALIB@ export JAVALIB="@JAVALIB@" export JFREEREPORT_JAR="@JFREEREPORT_JAR@" export KDE4_CFLAGS="@KDE4_CFLAGS@" export KDE4_LIBS="@KDE4_LIBS@" diff --git a/configure.in b/configure.in index cc40ed9009d4..b7b255abe95e 100644 --- a/configure.in +++ b/configure.in @@ -2537,8 +2537,10 @@ AC_SUBST(MSPDB_PATH) AC_SUBST(SHOWINCLUDES_PREFIX) # -# determine CPI, CPUNAME, GUI, GUIBASE, ... +# determine CPU, CPUNAME, GUI, GUIBASE, ... # +LIB64="lib" + case "$host_os" in aix*) @@ -2564,6 +2566,7 @@ cygwin*) if test "$CL_X64" != ""; then CPU=X CPUNAME=X86_64 + LIB64="lib/x64" OUTPATH=wntmscx$COMEX else CPU=I @@ -2713,6 +2716,7 @@ linux-gnu*) powerpc64) CPU=P CPUNAME=POWERPC64 + LIB64="lib64" OUTPATH=unxlngppc64 ;; sparc) @@ -2728,11 +2732,13 @@ linux-gnu*) s390x) CPU=3 CPUNAME=S390x + LIB64="lib64" OUTPATH=unxlngs390x ;; x86_64) CPU=X CPUNAME=X86_64 + LIB64="lib64" OUTPATH=unxlngx6 ;; *) @@ -4726,6 +4732,236 @@ if test "$SOLAR_JAVA" != ""; then AC_SUBST(AWTLIB) fi +# +# Determine JAVALIB +# If your platform follow the common pattern +# just define JAVA_ARCH and JAVA_TOOLKIT for it +# if not, leave JAVA_ARCH empty and define JAVALIB manually +# if you don't want JAVALIB to be exported at all +# define x_JAVALIB=[\#] +# +JAVA_ARCH= +JAVA_TOOLKIT= +x_JAVALIB= + +case "$host_os" in + +aix*) + JAVA_ARCH="ppc" + JAVA_TOOLKIT="classic" + ;; + +cygwin*|darwin*) + x_JAVALIB=[\#] + ;; + +dragonfly*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +freebsd*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + if test "`echo $JAVA_HOME | sed -e 's,.*/,,'`" = "linux" ; then + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + else + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + fi + ;; + esac + ;; + +k*bsd*-gnu*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +linux-gnu*) + + case "$host_cpu" in + + alpha) + JAVA_ARCH="alpha" + JAVA_TOOLKIT="server" + ;; + arm) + JAVA_ARCH="arm" + JAVA_TOOLKIT="server" + ;; + hppa) + JAVA_ARCH="hppa" + JAVA_TOOLKIT="server" + ;; + i*86) + JAVA_ARCH="i386" + case "$JDK" in + [Ii][Bb][Mm]*) + JAVA_ARCH= + JRE_BASE_DIR="$JAVA_HOME/jre/bin" + JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/classic -L $JRE_BASE_DIR/native_thread" + ;; + [Bb][Ee][Aa]*) + JAVA_TOOLKIT="jrockit"; + ;; + *) + JAVA_TOOLKIT="client"; + ;; + esac + ;; + ia64) + JAVA_ARCH="ia64" + JAVA_TOOLKIT="server" + ;; + m68k) + JAVA_ARCH="mk68" + JAVA_TOOLKIT="server" + ;; + mips|mips64|mipsel|mips64el) + JAVA_ARCH="$host_cpu" + JAVA_TOOLKIT="server" + ;; + mips32) + JAVA_ARCH="$host_cpu" + JAVA_TOOLKIT="client" + ;; + powerpc) + JAVA_ARCH="ppc" + case "$JDK" in + [Ii][Bb][Mm]*) + JAVA_TOOLKIT="classic" + ;; + gcj) + JAVA_TOOLKIT="client" + ;; + *) + JAVA_TOOLKIT="server" + ;; + esac + ;; + powerpc64) + JAVA_ARCH="ppc64" + if test "$JDK" = "gcj" ; then + JAVA_TOOLKIT="client" + else + JAVA_TOOLKIT="server" + fi + ;; + sparc) + JAVA_ARCH="sparc" + JAVA_TOOLKIT="server" + ;; + s390) + JAVA_ARCH="s390" + JAVA_TOOLKIT="server" + ;; + s390x) + JAVA_ARCH="s390x" + JAVA_TOOLKIT="server" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + *) + AC_MSG_ERROR([No JAVALIB defintion host_cpu $host_cpu for host_os $host_os]) + ;; + esac + ;; + +linux-androideabi*) + + case "$host_cpu" in + + armel) + JAVA_ARCH="arm" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +mingw*) + x_JAVALIB=[\#] + ;; + +*netbsd*) + + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + powerpc) + JAVA_ARCH="pcc" + JAVA_TOOLKIT="classic" + ;; + sparc) + JAVA_ARCH="sparc" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="client" + ;; + esac + ;; + +openbsd*) + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + JAVA_TOOLKIT="client" + ;; + x86_64) + JAVA_ARCH="amd64" + JAVA_TOOLKIT="server" + ;; + esac + ;; + +solaris*) + + JAVA_TOOLKIT="xawt" + case "$host_cpu" in + i*86) + JAVA_ARCH="i386" + ;; + sparc) + JAVA_ARCH="sparc" + ;; + esac + ;; +esac + +if test -n "$JAVA_ARCH" ; then + JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH" + JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread" +fi + +AC_SUBST(x_JAVALIB) +AC_SUBST(JAVALIB) AC_SUBST(JAVA_HOME) AC_SUBST(JDK) AC_SUBST(JAVAFLAGS) diff --git a/set_soenv.in b/set_soenv.in index a82ea138193a..57ccb36036ff 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -51,8 +51,7 @@ my ( $SOLAR_JAVA, # Platform dependent constant values. my ( $ARCH, $OSVERSION, $OUTPATH, $INPATH, - $DYNAMIC_CRT, $use_shl_versions, $JRELIBDIR, - $JRETOOLKITDIR, $JRETHREADDIR ); + $DYNAMIC_CRT, $use_shl_versions ); # #------------------------------------------- # IIc. Declaring the environment variables. @@ -71,7 +70,7 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $SOLARSRC, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $SOLARDEFIMG, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $SHOWINCLUDES_PREFIX, - $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB, + $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $SOLARINC, $FRAMEWORKSHOME, $COMEX, $PERL, $COMP_ENV, $ILIB, $JAVAHOME, $WINDOWS_SDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR, @@ -167,59 +166,10 @@ $TARFILE_LOCATION = "@TARFILE_LOCATION@"; # where to find tarballs with external # Setting platform dependent constant values. if ( $platform =~ m/solaris/ ) { - print "Setting Solaris specific values... "; - if ($platform =~ m/^i[3456]86/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."xawt"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - else - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; - } - $COMPATH = '@COMPATH@'; } elsif ( $platform =~ m/netbsd/ ) { -#Set platform specific values: - if ($platform =~ m/^i[3456]86/) - { - print "Setting NetBSD x86 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - elsif ($platform =~ m/^x86_64/) - { - print "Setting NetBSD x86-64 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; - } - elsif ($platform =~ m/^sparc/) - { - print "Setting NetBSD Sparc specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; - } - elsif ($platform =~ m/powerpc/) - { - print "Setting NetBSD PPC specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; - } - else - { - print "Unsupported NetBSD architecture: $platform \n"; - exit 1; - } - # General NetBSD settings: $COMPATH = '@COMPATH@'; } elsif ( $platform =~ m/kfreebsd/ ) @@ -227,83 +177,16 @@ elsif ( $platform =~ m/kfreebsd/ ) # General GNU/kFreeBSD settings: $COMPATH = '@COMPATH@'; -#Set platform specific values: - if ($platform =~ m/^i[3456]86/) - { - print "Setting GNU/kFreeBSD x86 specific values... "; - - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - elsif ($platform =~ m/^x86_64/) - { - print "Setting GNU/kFreeBSD x86-64 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; - } - } elsif ( $platform =~ m/freebsd/ ) { $COMPATH = '@COMPATH@'; $OSVERSION = '@OSVERSION@'; - if ($platform =~ m/^(amd64|x86_64)/) - { - my ( $JAVA_OS ); - print "Setting FreeBSD AMD64 specific values... "; - $JAVA_OS = '@JAVA_HOME@'; - $JAVA_OS =~ s/.*\///; - if ($JAVA_OS =~ m/^linux/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - else - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; - } - } - elsif ($platform =~ m/^i386/) - { - print "Setting FreeBSD x86 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - else - { - print "Unsupported FreeBSD architecture: $platform \n"; - exit 1; - } } elsif ( $platform =~ m/openbsd/ ) { $COMPATH = '@COMPATH@'; $OSVERSION = '@OSVERSION@'; - if ($platform =~ m/^(amd64|x86_64)/) - { - print "Setting OpenBSD AMD64 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; - } - elsif ($platform =~ m/^i386/) - { - print "Setting OpenBSD x86 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - else - { - print "Unsupported OpenBSD architecture: $platform \n"; - exit 1; - } } elsif ( $platform =~ m/linux/ ) { @@ -313,145 +196,38 @@ elsif ( $platform =~ m/linux/ ) #Set platform specific values: if ($platform =~ m/^i[3456]86/) { - print "Setting Linux x86 specific values... "; - if ($JDK =~ m/^[Ii][Bb][Mm]/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."bin"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."bin".$ds."classic"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."bin"; - } - elsif ($JDK =~ m/^[Bb][Ee][Aa]/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - else - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - # has both server and client - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } } elsif ($platform =~ m/^x86_64/) { - print "Setting Linux x86-64 specific values... "; - # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1 - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - # has both server and client - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; } elsif ($platform =~ m/^ia64/) { - print "Setting Linux ia64 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads"; } elsif ($platform =~ m/^sparc/) { - print "Setting Linux Sparc specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads"; } elsif ($platform =~ m/^powerpc/) { - if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) - { - print "Setting Linux PPC64 specific values... "; - if ( $JDK eq "gcj" ) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads"; - } - # OpenJDK - elsif ($JDK =~ m/sun/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads"; - } - } - else - { - print "Setting Linux PPC specific values... "; - if ( $JDK eq "gcj" ) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; - } - elsif ($JDK =~ m/^[Ii][Bb][Mm]/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - } - # OpenJDK - elsif ($JDK =~ m/sun/) - { - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; - } - } } elsif ($platform =~ m/^s390/) { - if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) - { - print "Setting Linux zSeries specific values... "; - $ARCH = "s390x"; - } - else - { - print "Setting Linux S/390 specific values... "; - $ARCH = "s390"; - } - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads"; } elsif ($platform =~ m/^m68k/) { - print "Setting Linux m68k specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads"; } elsif ($platform =~ m/^hppa/) { - print "Setting Linux hppa specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."hppa".$ds."native_threads"; $EPM_FLAGS = "-a hppa"; } elsif ($platform =~ m/^alpha/) { - print "Setting Linux Alpha specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads"; } elsif ($platform =~ m/^arm.*?l-/) { - print "Setting Linux ARM specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads"; $EPM_FLAGS = "-a arm"; } elsif ($platform =~ m/^arm.*-androideabi/) { - print "Setting Android ARM specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads"; $EPM_FLAGS = "-a arm"; } elsif ($platform =~ m/^mips/) @@ -463,14 +239,6 @@ elsif ( $platform =~ m/linux/ ) if ('@WORDS_BIGENDIAN@' ne 'yes') { $EPM_FLAGS = "-a mips64el"; - if ( $JDK eq "gcj" ) - { - $ARCH = "mips64el"; - } - } - else - { - $ARCH = "mips64"; } } else @@ -478,31 +246,8 @@ elsif ( $platform =~ m/linux/ ) if ('@WORDS_BIGENDIAN@' ne 'yes') { $EPM_FLAGS = "-a mipsel"; - if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) - { - $ARCH = "mips32"; # Lemote - } - else - { - $ARCH = "mipsel"; - } - } - else - { - $ARCH = "mips"; } } - - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH; - if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) - { - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote - } - else - { - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server"; - } - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads"; } } elsif ( $platform =~ m/cygwin|mingw32/ ) @@ -575,34 +320,11 @@ elsif ( $platform =~ m/darwin/ ) } elsif ( $platform =~ m/dragonfly/ ) { - if ($platform =~ m/^i386/) - { - print "Setting DragonFly i386 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."client"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; - } - elsif ($platform =~ m/^x86_64/) - { - print "Setting DragonFly x86-64 specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."server"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads"; - } - else - { - print "Unsupported DragonFly architecture: $platform \n"; - exit 1; - } - # General DragonFly settings: + # General DragonFly settings: $COMPATH = '@COMPATH@'; } elsif ( $platform =~ m/aix/ ) { - print "Setting AIX PPC specific values... "; - $JRELIBDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc"; - $JRETOOLKITDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."classic"; - $JRETHREADDIR = $JAVA_HOME.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; $COMPATH = '@COMPATH@'; } else @@ -973,10 +695,6 @@ if ($platform =~ m/solaris/) $L.$USR_OPENWIN.$LIB. $L.$XLIB; - $JAVALIB = $L.$JAVA_HOME.$LIB. - $L.$JRELIBDIR. - $L.$JRETOOLKITDIR. - $L.$JRETHREADDIR; } elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/) { $SOLARLIB = $L.$par_dir.$LIB. @@ -989,11 +707,6 @@ elsif ($platform =~ m/linux|netbsd|aix|freebsd|openbsd|dragonfly/) if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" && $XLIB ne "no_x_libraries" ) { $SOLARLIB .= $L.$XLIB; } - $JAVALIB = ''; - $JAVALIB .= $L.$JAVA_HOME.$LIB64 if (-d $JAVA_HOME.$LIB64); - $JAVALIB .= $L.$JRELIBDIR if (-d $JRELIBDIR); - $JAVALIB .= $L.$JRETOOLKITDIR if (-d $JRETOOLKITDIR); - $JAVALIB .= $L.$JRETHREADDIR if (-d $JRETHREADDIR);; } elsif ($platform =~ m/cygwin|mingw32/) { $SOLARLIB = $L.$par_dir.$LIB. @@ -1304,7 +1017,6 @@ else ToFile( "PATH", $PATH, "e" ); } ToFile( "SOLARLIB", $SOLARLIB, "e" ); -ToFile( "JAVALIB", $JAVALIB, "e" ); ToFile( "SOLARINC", $SOLARINC, "e" ); ToFile( "COMP_ENV", $COMP_ENV, "e" ); ToFile( "JAVAHOME", $JAVAHOME, "e" ); -- cgit