diff options
Diffstat (limited to 'package/openjdk/patches/patch-icedtea6-1_10_configure')
| -rw-r--r-- | package/openjdk/patches/patch-icedtea6-1_10_configure | 479 |
1 files changed, 479 insertions, 0 deletions
diff --git a/package/openjdk/patches/patch-icedtea6-1_10_configure b/package/openjdk/patches/patch-icedtea6-1_10_configure new file mode 100644 index 000000000..d9b96d1d4 --- /dev/null +++ b/package/openjdk/patches/patch-icedtea6-1_10_configure @@ -0,0 +1,479 @@ +--- 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 |