jdk8-mips64-public: comparison common/autoconf/libraries.m4

-:fda76d0c4b84
+:7a73b8b4ac8a
 #
 # Check if the user has specified sysroot, but not --x-includes or --x-libraries.
 # Make a simple check for the libraries at the sysroot, and setup --x-includes and
 # --x-libraries for the sysroot, if that seems to be correct.
-if test "x$SYS_ROOT" != "x/"; then
+if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
-if test "x$x_includes" = xNONE; then
+if test "x$SYSROOT" != "x"; then
-if test -f "$SYS_ROOT/usr/X11R6/include/X11/Xlib.h"; then
+if test "x$x_includes" = xNONE; then
-x_includes="$SYS_ROOT/usr/X11R6/include"
+if test -f "$SYSROOT/usr/X11R6/include/X11/Xlib.h"; then
-elif test -f "$SYS_ROOT/usr/include/X11/Xlib.h"; then
+x_includes="$SYSROOT/usr/X11R6/include"
-x_includes="$SYS_ROOT/usr/include"
+elif test -f "$SYSROOT/usr/include/X11/Xlib.h"; then
-fi
+x_includes="$SYSROOT/usr/include"
 fi
-if test "x$x_libraries" = xNONE; then
+fi
-if test -f "$SYS_ROOT/usr/X11R6/lib/libX11.so"; then
+if test "x$x_libraries" = xNONE; then
-x_libraries="$SYS_ROOT/usr/X11R6/lib"
+if test -f "$SYSROOT/usr/X11R6/lib/libX11.so"; then
-elif test "$SYS_ROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+x_libraries="$SYSROOT/usr/X11R6/lib"
-x_libraries="$SYS_ROOT/usr/lib64"
+elif test "$SYSROOT/usr/lib64/libX11.so" && test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
-elif test -f "$SYS_ROOT/usr/lib/libX11.so"; then
+x_libraries="$SYSROOT/usr/lib64"
-x_libraries="$SYS_ROOT/usr/lib"
+elif test -f "$SYSROOT/usr/lib/libX11.so"; then
+x_libraries="$SYSROOT/usr/lib"
+fi
 fi
 fi
 fi
 # Now let autoconf do it's magic
 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then
 HELP_MSG_MISSING_DEPENDENCY([x11])
 AC_MSG_ERROR([Could not find X11 libraries. $HELP_MSG])
 fi
 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 OPENWIN_HOME="/usr/openwin"
-fi
+X_CFLAGS="-I$SYSROOT$OPENWIN_HOME/include -I$SYSROOT$OPENWIN_HOME/include/X11/extensions"
-AC_SUBST(OPENWIN_HOME)
+X_LIBS="-L$SYSROOT$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
+-L$SYSROOT$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR \
+-R$OPENWIN_HOME/sfw/lib$OPENJDK_TARGET_CPU_ISADIR \
+-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
+fi
 #
 # Weird Sol10 something check...TODO change to try compile
 #
 if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
 fi
 if test "x$CUPS_FOUND" = xno; then
 # Getting nervous now? Lets poke around for standard Solaris third-party
 # package installation locations.
 AC_MSG_CHECKING([for cups headers])
-if test -s /opt/sfw/cups/include/cups/cups.h; then
+if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then
 # An SFW package seems to be installed!
 CUPS_FOUND=yes
-CUPS_CFLAGS="-I/opt/sfw/cups/include"
+CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include"
-elif test -s /opt/csw/include/cups/cups.h; then
+elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then
 # A CSW package seems to be installed!
 CUPS_FOUND=yes
-CUPS_CFLAGS="-I/opt/csw/include"
+CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
 fi
 AC_MSG_RESULT([$CUPS_FOUND])
 fi
 if test "x$CUPS_FOUND" = xno; then
 HELP_MSG_MISSING_DEPENDENCY([cups])
 AC_MSG_RESULT([yes (using builddeps)])
 fi
 fi
 fi
-if test "x$FOUND_FREETYPE" != xyes; then
+# If we have a sysroot, assume that's where we are supposed to look and skip pkg-config.
-# Check modules using pkg-config, but only if we have it (ugly output results otherwise)
+if test "x$SYSROOT" = x; then
-if test "x$PKG_CONFIG" != x; then
+if test "x$FOUND_FREETYPE" != xyes; then
-PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
+# Check modules using pkg-config, but only if we have it (ugly output results otherwise)
-if test "x$FOUND_FREETYPE" = xyes; then
+if test "x$PKG_CONFIG" != x; then
-# On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
+PKG_CHECK_MODULES(FREETYPE, freetype2, [FOUND_FREETYPE=yes], [FOUND_FREETYPE=no])
-FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
+if test "x$FOUND_FREETYPE" = xyes; then
-# 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
+# On solaris, pkg_check adds -lz to freetype libs, which isn't necessary for us.
-if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's/-lz//g'`
-FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
+# 64-bit libs for Solaris x86 are installed in the amd64 subdirectory, change lib to lib/amd64
-fi
+if test "x$OPENJDK_TARGET_OS" = xsolaris && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
+FREETYPE_LIBS=`$ECHO $FREETYPE_LIBS | $SED 's?/lib?/lib/amd64?g'`
-if test "x$BUNDLE_FREETYPE" = xyes; then
+fi
-AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
+# BDEPS_CHECK_MODULE will set FREETYPE_CFLAGS and _LIBS, but we don't get a lib path for bundling.
-FOUND_FREETYPE=no
+if test "x$BUNDLE_FREETYPE" = xyes; then
-else
+AC_MSG_NOTICE([Found freetype using pkg-config, but ignoring since we can not bundle that])
-AC_MSG_CHECKING([for freetype])
+FOUND_FREETYPE=no
-AC_MSG_RESULT([yes (using pkg-config)])
+else
+AC_MSG_CHECKING([for freetype])
+AC_MSG_RESULT([yes (using pkg-config)])
+fi
 fi
 fi
 fi
 fi
 FREETYPE_BASE_DIR="$ProgramW6432/GnuWin32"
 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(FREETYPE_BASE_DIR)
 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
 fi
 else
-if test "x$SYS_ROOT" = "x/"; then
+FREETYPE_BASE_DIR="$SYSROOT/usr"
-FREETYPE_ROOT=
-else
-FREETYPE_ROOT="$SYS_ROOT"
-fi
-FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
 if test "x$FOUND_FREETYPE" != xyes; then
-FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr/X11"
+FREETYPE_BASE_DIR="$SYSROOT/usr/X11"
 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
 fi
 if test "x$FOUND_FREETYPE" != xyes; then
-FREETYPE_BASE_DIR="$FREETYPE_ROOT/usr"
+FREETYPE_BASE_DIR="$SYSROOT/usr/sfw"
+LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib], [well-known location])
+fi
+if test "x$FOUND_FREETYPE" != xyes; then
+FREETYPE_BASE_DIR="$SYSROOT/usr"
 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/x86_64-linux-gnu], [well-known location])
 else
 LIB_CHECK_POTENTIAL_FREETYPE([$FREETYPE_BASE_DIR/include], [$FREETYPE_BASE_DIR/lib/i386-linux-gnu], [well-known location])
 if test "x$FOUND_FREETYPE" != xyes; then
 ALSA_FOUND=yes
 fi
 if test "x$ALSA_FOUND" = xno; then
 BDEPS_CHECK_MODULE(ALSA, alsa, xxx, [ALSA_FOUND=yes], [ALSA_FOUND=no])
 fi
-if test "x$ALSA_FOUND" = xno; then
+# Do not try pkg-config if we have a sysroot set.
-PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
+if test "x$SYSROOT" = x; then
+if test "x$ALSA_FOUND" = xno; then
+PKG_CHECK_MODULES(ALSA, alsa, [ALSA_FOUND=yes], [ALSA_FOUND=no])
+fi
 fi
 if test "x$ALSA_FOUND" = xno; then
 AC_CHECK_HEADERS([alsa/asoundlib.h],
 [
 ALSA_FOUND=yes
 AC_SUBST(LLVM_LIBS)
 fi
 # libCrun is the c++ runtime-library with SunStudio (roughly the equivalent of gcc's libstdc++.so)
 if test "x$TOOLCHAIN_TYPE" = xsolstudio && test "x$LIBCXX" = x; then
-LIBCXX="/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
+LIBCXX="${SYSROOT}/usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libCrun.so.1"
 fi
 # TODO better (platform agnostic) test
 if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$TOOLCHAIN_TYPE" = xgcc; then
 LIBCXX="-lstdc++"

Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/libraries.m4

common/autoconf/libraries.m4