equal
deleted
inserted
replaced
93 LIB_SETUP_ALSA |
93 LIB_SETUP_ALSA |
94 LIB_SETUP_LIBFFI |
94 LIB_SETUP_LIBFFI |
95 LIB_SETUP_LLVM |
95 LIB_SETUP_LLVM |
96 LIB_SETUP_BUNDLED_LIBS |
96 LIB_SETUP_BUNDLED_LIBS |
97 LIB_SETUP_MISC_LIBS |
97 LIB_SETUP_MISC_LIBS |
|
98 LIB_SETUP_SOLARIS_STLPORT |
98 ]) |
99 ]) |
99 |
100 |
100 ################################################################################ |
101 ################################################################################ |
101 # Setup llvm (Low-Level VM) |
102 # Setup llvm (Low-Level VM) |
102 ################################################################################ |
103 ################################################################################ |
187 |
188 |
188 # Control if libzip can use mmap. Available for purposes of overriding. |
189 # Control if libzip can use mmap. Available for purposes of overriding. |
189 LIBZIP_CAN_USE_MMAP=true |
190 LIBZIP_CAN_USE_MMAP=true |
190 AC_SUBST(LIBZIP_CAN_USE_MMAP) |
191 AC_SUBST(LIBZIP_CAN_USE_MMAP) |
191 ]) |
192 ]) |
|
193 |
|
194 ################################################################################ |
|
195 # libstlport.so.1 is needed for running gtest on Solaris. Find it to |
|
196 # redistribute it in the test image. |
|
197 ################################################################################ |
|
198 AC_DEFUN_ONCE([LIB_SETUP_SOLARIS_STLPORT], |
|
199 [ |
|
200 if test "$OPENJDK_TARGET_OS" = "solaris"; then |
|
201 # Find the root of the Solaris Studio installation from the compiler path |
|
202 SOLARIS_STUDIO_DIR="$(dirname $CC)/.." |
|
203 STLPORT_LIB="$SOLARIS_STUDIO_DIR/lib/stlport4$OPENJDK_TARGET_CPU_ISADIR/libstlport.so.1" |
|
204 AC_MSG_CHECKING([for libstlport.so.1]) |
|
205 if test -f "$STLPORT_LIB"; then |
|
206 AC_MSG_RESULT([yes, $STLPORT_LIB]) |
|
207 BASIC_FIXUP_PATH([STLPORT_LIB]) |
|
208 else |
|
209 AC_MSG_RESULT([no, not found at $STLPORT_LIB]) |
|
210 AC_MSG_ERROR([Failed to find libstlport.so.1, cannot build Hotspot gtests]) |
|
211 fi |
|
212 AC_SUBST(STLPORT_LIB) |
|
213 fi |
|
214 ]) |
|
215 |