diff options
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 118 | ||||
| -rw-r--r-- | package/openjdk/patches/patch-icedtea6-1_10_Makefile_in | 28 | ||||
| -rw-r--r-- | package/openjdk/patches/patch-icedtea6-1_10_configure | 479 |
3 files changed, 101 insertions, 524 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 73812e426..8802ee529 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -7,25 +7,43 @@ PKG_NAME:= openjdk PKG_VERSION:= 6 PKG_EXTRAVER:= b22-28_feb_2011 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 fd3f35e8a8a2ef9a64c035ed66cea06d +PKG_MD5SUM:= 2d2bbbb0f9b81f1fec41ec730da8a933 \ + fd3f35e8a8a2ef9a64c035ed66cea06d \ + ef7a8b3624ea904bf584bc46d79b5e75 \ + bc95c133620bd68c161cac9891592901 \ + 91adfd41e6f001add4f92ae31216b1e3 \ + d526d0848c88607ce4e3a0a4edb75d50 PKG_DESCR:= OpenJDK Java VM PKG_SECTION:= lang -PKG_BUILDDEP:= xproto jpeg zlib libX11 libpng freetype +PKG_BUILDDEP:= alsa-lib xproto jpeg zlib libX11 libpng freetype cups +PKG_BUILDDEP+= libXt libXp libXinerama libXrender libXtst PKG_URL:= http://openjdk.org/ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ + http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \ + http://icedtea.classpath.org/download/drops/ \ http://icedtea.classpath.org/download/source/ # autotools infrastructure for OpenJDK ICEDTEA_NAME:= icedtea6 ICEDTEA_VERSION:= 1.10 -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz -NO_DISTFILES:= 1 +# bootstrap JARs +XALAN_NAME= xalan-j +XALAN_VERSION= 2_7_0 + +# override generic extraction +EXTRACT_OVERRIDE:= 1 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz \ + $(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz \ + jaxp144_01.zip \ + jdk6-jaf-b20.zip \ + jdk6-jaxws-b20.zip \ + ${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz + WRKDIST= ${WRKDIR} +WRKSRC= ${WRKDIST}/${ICEDTEA_NAME}-${ICEDTEA_VERSION} PKG_SUBPKGS:= OPENJDK -PKG_CFLINE_OPENJDK:= select ADK_TOOLCHAIN_GCC_JAVA - PKG_CHOICES_OPENJDK:= ZERO SHARK CACAO JAMVM PKGCD_ZERO:= zero-assembly backend PKGCD_SHARK:= JIT backend @@ -36,49 +54,75 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +BUILD_STYLE:= manual +INSTALL_STYLE:= manual +TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) + ifeq ($(ADK_PACKAGE_OPENJDK_ZERO),y) CONFIGURE_ARGS+= --enable-zero endif ifeq ($(ADK_PACKAGE_OPENJDK_SHARK),y) -CONFIGURE_ARGS+= --enable-shark +CONFIGURE_ARGS+= --enable-shark endif +BOOTSTRAPJDK:= ${WRKDIST}/bootstrap-jdk CONFIGURE_ARGS+= --disable-docs \ --enable-bootstrap \ - --disable-openjdk-cross-compilation \ - --with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \ - --with-xerces2-jar=/usr/share/java/xercesImpl.jar \ - --with-ecj-jar=$(TOPDIR)/dl/ecj.jar \ - --with-gcj \ - --without-rhino \ - --disable-xrender \ - --disable-nss + --enable-openjdk-cross-compilation \ + --with-cc-for-build=$(CC_FOR_BUILD) \ + --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ + --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ + --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \ + --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \ + --with-jdk-home=$(BOOTSTRAPJDK) \ + --with-java=$(BOOTSTRAPJDK)/bin/java \ + --with-javac=$(BOOTSTRAPJDK)/bin/javac \ + --with-javah=$(BOOTSTRAPJDK)/bin/javah \ + --with-jar=$(BOOTSTRAPJDK)/bin/jar \ + --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ + --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ + --without-rhino + +OPENJDK_NATIVE_ENV+= JAVACFLAGS="-cp ${STAGING_JAVA_HOST_DIR}/usr/share/java/libgcj-4.5.2.jar" +OPENJDK_NATIVE_ENV+= DYLD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_JAVA_HOST_DIR)/usr/lib:$(STAGING_JAVA_HOST_DIR)/usr/lib64 +OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj + +OPENJDK_BUILD_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin do-extract: - (cd ${WRKBUILD}; mkdir $(PKG_NAME)-$(PKG_VERSION) ; tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION)) - (cd $(WRKBUILD); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz) + cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \ + tar xzf $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION)-src-$(PKG_EXTRAVER).tar.gz -C $(PKG_NAME)-$(PKG_VERSION) + cd $(WRKDIST); tar xzf $(TOPDIR)/dl/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION).tar.gz + cd ${WRKDIST}; tar xzf ${TOPDIR}/dl/${XALAN_NAME}_${XALAN_VERSION}-bin.tar.gz + mkdir -p ${WRKBUILD}/drops + cd ${TOPDIR}/dl; cp jaxp144_01.zip jdk6-jaf-b20.zip jdk6-jaxws-b20.zip \ + ${WRKBUILD}/drops pre-configure: - (cd ${WRKBUILD}/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION); rm -rf config.{cache,status} ; \ - ./configure \ - --enable-bootstrap \ - --enable-zero \ - --disable-docs \ - --disable-openjdk-cross-compilation \ - --with-openjdk-src-dir=$(WRKBUILD)/$(PKG_NAME)-$(PKG_VERSION) \ - --with-jdk-home=$(STAGING_HOST_DIR)/lib/jvm \ - --with-xalan2-jar=/usr/share/java/xalan.jar \ - --with-xalan2-serializer-jar=/usr/share/java/serializer.jar \ - --with-xerces2-jar=/usr/share/java/xercesImpl.jar \ - --with-ecj-jar=$(TOPDIR)/dl/ecj.jar \ - --with-gcj \ - --without-rhino \ - --disable-xrender \ - --disable-nss \ - ); - (cd $(WRKBUILD)/$(ICEDTEA_NAME)-$(ICEDTEA_VERSION) ; ${MAKE} ) + cd ${WRKBUILD}; rm -rf config.{cache,status}; \ + export ${OPENJDK_NATIVE_ENV}; ./configure \ + --enable-bootstrap \ + --enable-zero \ + --disable-openjdk-cross-compilation \ + --with-openjdk-src-dir=$(WRKDIST)/$(PKG_NAME)-$(PKG_VERSION) \ + --with-jdk-home=$(STAGING_JAVA_HOST_DIR)/usr/lib/jvm \ + --with-java=$(STAGING_JAVA_HOST_DIR)/usr/bin/java \ + --with-javac=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ + --with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \ + --with-ecj-jar=${STAGING_JAVA_HOST_DIR}/usr/share/ecj.jar \ + --with-xalan2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xalan.jar \ + --with-xalan2-serializer-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/serializer.jar \ + --with-xerces2-jar=${WRKDIST}/${XALAN_NAME}_${XALAN_VERSION}/xercesImpl.jar \ + --without-rhino \ + --disable-docs \ + && $(MAKE) && $(CP) $(WRKSRC)/openjdk.build/j2sdk-image ${WRKDIST}/bootstrap-jdk && $(MAKE) clean && rm -rf ${WRKBUILD}/openjdk-old + +do-build: + cd ${WRKBUILD}; export $(OPENJDK_BUILD_ENV); make + +do-install: + cd ${WRKBUILD}; make install openjdk-install: $(INSTALL_DIR) $(IDIR_OPENJDK)/usr/bin diff --git a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in index 7e19f5159..50667a68a 100644 --- a/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in +++ b/package/openjdk/patches/patch-icedtea6-1_10_Makefile_in @@ -1,5 +1,5 @@ ---- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.161291458 +0100 -+++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-03-28 17:00:03.591807998 +0200 +--- w-openjdk-6-1.orig/icedtea6-1.10/Makefile.in 2011-03-02 20:48:45.000000000 +0100 ++++ w-openjdk-6-1/icedtea6-1.10/Makefile.in 2011-04-02 23:33:17.000000000 +0200 @@ -1329,7 +1329,7 @@ stamps/extract-openjdk.stamp: stamps/dow @OPENJDK_SRC_DIR_FOUND_TRUE@ cp -pPR $(OPENJDK_SRC_DIR_LINK) $(OPENJDK_SRC_DIR) openjdk ; \ @OPENJDK_SRC_DIR_FOUND_TRUE@ fi @@ -18,12 +18,24 @@ fi mkdir -p stamps touch stamps/extract-ecj.stamp -@@ -1644,7 +1644,7 @@ clean-patch-ecj: +@@ -1642,11 +1642,15 @@ clean-patch-ecj: + # =========================== + stamps/native-ecj.stamp: - mkdir -p stamps ; \ - if test "x$(GCJ)" != "xno"; then \ +- mkdir -p stamps ; \ +- if test "x$(GCJ)" != "xno"; then \ - $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ -+ $(GCJ) -static $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ - --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ - fi ; \ +- --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ +- fi ; \ ++ mkdir -p stamps ; \ ++ if test -n "${ADK_ECJ}" && test -x "${ADK_ECJ}"; then \ ++ ln -s "${ADK_ECJ}" native-ecj; \ ++ else \ ++ if test "x$(GCJ)" != "xno"; then \ ++ $(GCJ) $(IT_CFLAGS) -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \ ++ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \ ++ fi ; \ ++ fi; \ touch stamps/native-ecj.stamp + + clean-native-ecj: diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure deleted file mode 100644 index d9b96d1d4..000000000 --- a/package/openjdk/patches/patch-icedtea6-1_10_configure +++ /dev/null @@ -1,479 +0,0 @@ ---- w-openjdk-6-1.orig/icedtea6-1.10/configure 2011-03-02 20:48:44.321157333 +0100 -+++ w-openjdk-6-1/icedtea6-1.10/configure 2011-03-28 15:30:08.791808629 +0200 -@@ -10805,22 +10805,6 @@ fi - - - --for ac_header in cups/cups.h cups/ppd.h --do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : -- cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- -- --else -- as_fn_error $? "\"CUPS headers were not found - -- try installing cups-devel.\"" "$LINENO" 5 --fi -- --done - - for ac_header in X11/X.h - do : -@@ -10879,46 +10863,6 @@ else - as_fn_error $? "\"libjpeg not found - try installing libjpeg-devel\"" "$LINENO" 5 - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 --$as_echo_n "checking for main in -lgif... " >&6; } --if ${ac_cv_lib_gif_main+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lgif $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --int --main () --{ --return main (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_gif_main=yes --else -- ac_cv_lib_gif_main=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 --$as_echo "$ac_cv_lib_gif_main" >&6; } --if test "x$ac_cv_lib_gif_main" = xyes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBGIF 1 --_ACEOF -- -- LIBS="-lgif $LIBS" -- --else -- as_fn_error $? "\"giflib not found - try installing giflib-devel\"" "$LINENO" 5 --fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lz" >&5 - $as_echo_n "checking for main in -lz... " >&6; } -@@ -11040,156 +10984,9 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5 --$as_echo_n "checking for XT... " >&6; } -- --if test -n "$XT_CFLAGS"; then -- pkg_cv_XT_CFLAGS="$XT_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xt") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XT_CFLAGS=`$PKG_CONFIG --cflags "xt" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XT_LIBS"; then -- pkg_cv_XT_LIBS="$XT_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xt") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XT_LIBS=`$PKG_CONFIG --libs "xt" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1` -- else -- XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XT_PKG_ERRORS" >&5 -- -- XT_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XT_FOUND=no --else -- XT_CFLAGS=$pkg_cv_XT_CFLAGS -- XT_LIBS=$pkg_cv_XT_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XT_FOUND=yes --fi --if test "x${XT_FOUND}" = xno --then -- as_fn_error $? "Could not find Xt - \ -- Try installing libXt-devel." "$LINENO" 5 --fi -- -- -- -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XP" >&5 --$as_echo_n "checking for XP... " >&6; } -- --if test -n "$XP_CFLAGS"; then -- pkg_cv_XP_CFLAGS="$XP_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XP_CFLAGS=`$PKG_CONFIG --cflags "xp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XP_LIBS"; then -- pkg_cv_XP_LIBS="$XP_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xp\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xp") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XP_LIBS=`$PKG_CONFIG --libs "xp" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- - --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } - --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xp" 2>&1` -- else -- XP_PKG_ERRORS=`$PKG_CONFIG --print-errors "xp" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XP_PKG_ERRORS" >&5 - -- XP_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XP_FOUND=no --else -- XP_CFLAGS=$pkg_cv_XP_CFLAGS -- XP_LIBS=$pkg_cv_XP_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XP_FOUND=yes --fi --if test "x${XP_FOUND}" = xno --then -- as_fn_error $? "Could not find Xp - \ -- Try installing libXp-devel." "$LINENO" 5 --fi - - - -@@ -11271,83 +11068,6 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XINERAMA" >&5 --$as_echo_n "checking for XINERAMA... " >&6; } -- --if test -n "$XINERAMA_CFLAGS"; then -- pkg_cv_XINERAMA_CFLAGS="$XINERAMA_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XINERAMA_CFLAGS=`$PKG_CONFIG --cflags "xinerama" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XINERAMA_LIBS"; then -- pkg_cv_XINERAMA_LIBS="$XINERAMA_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xinerama\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xinerama") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XINERAMA_LIBS=`$PKG_CONFIG --libs "xinerama" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xinerama" 2>&1` -- else -- XINERAMA_PKG_ERRORS=`$PKG_CONFIG --print-errors "xinerama" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XINERAMA_PKG_ERRORS" >&5 -- -- XINERAMA_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XINERAMA_FOUND=no --else -- XINERAMA_CFLAGS=$pkg_cv_XINERAMA_CFLAGS -- XINERAMA_LIBS=$pkg_cv_XINERAMA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XINERAMA_FOUND=yes -- --fi --if test "x${XINERAMA_FOUND}" = xno --then -- as_fn_error $? "Could not find Xinerama - \ -- Try installing libXinerama-devel." "$LINENO" 5 --fi -- -- -- - if test "x${ENABLE_XRENDER}" = "xyes" - then - -@@ -11610,79 +11330,6 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5 --$as_echo_n "checking for XTST... " >&6; } -- --if test -n "$XTST_CFLAGS"; then -- pkg_cv_XTST_CFLAGS="$XTST_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XTST_CFLAGS=`$PKG_CONFIG --cflags "xtst" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$XTST_LIBS"; then -- pkg_cv_XTST_LIBS="$XTST_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtst\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "xtst") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_XTST_LIBS=`$PKG_CONFIG --libs "xtst" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- XTST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xtst" 2>&1` -- else -- XTST_PKG_ERRORS=`$PKG_CONFIG --print-errors "xtst" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$XTST_PKG_ERRORS" >&5 -- -- XTST_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- XTST_FOUND=no --else -- XTST_CFLAGS=$pkg_cv_XTST_CFLAGS -- XTST_LIBS=$pkg_cv_XTST_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- XTST_FOUND=yes --fi --if test "x${XTST_FOUND}" = xno --then -- as_fn_error $? "Could not find Xtst - \ -- Try installing libXtst-devel." "$LINENO" 5 --fi - - - -@@ -11764,85 +11411,6 @@ fi - - - --if test "x${BUILD_OS_DIR}" = "xlinux" --then -- --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5 --$as_echo_n "checking for ALSA... " >&6; } -- --if test -n "$ALSA_CFLAGS"; then -- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$ALSA_LIBS"; then -- pkg_cv_ALSA_LIBS="$ALSA_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "alsa") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa" 2>&1` -- else -- ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$ALSA_PKG_ERRORS" >&5 -- -- ALSA_FOUND=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- ALSA_FOUND=no --else -- ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS -- ALSA_LIBS=$pkg_cv_ALSA_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- ALSA_FOUND=yes --fi -- if test "x${ALSA_FOUND}" = xno -- then -- as_fn_error $? "Could not find alsa - \ -- Try installing alsa-lib-devel." "$LINENO" 5 -- fi -- -- --fi - - if test "x${enable_pulse_java}" = "xyes" - then |