--- files/gcc-4.1.0-delete-libart-check.patch +++ files/gcc-4.1.0-delete-libart-check.patch @@ -0,0 +1,208 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1141,10 +1141,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -310,7 +310,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -13729,107 +13729,6 @@ + + + +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- +-if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5 +-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6 +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- succeeded=yes +- +- echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5 +-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6 +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5 +-echo "${ECHO_T}$LIBART_CFLAGS" >&6 +- +- echo "$as_me:$LINENO: checking LIBART_LIBS" >&5 +-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6 +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5 +-echo "${ECHO_T}$LIBART_LIBS" >&6 +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +- + # We require the XTest Extension to support java.awt.Robot. + echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 + echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 +@@ -17876,8 +17775,6 @@ + s,@GTK_LIBS@,$GTK_LIBS,;t t + s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t + s,@GLIB_LIBS@,$GLIB_LIBS,;t t +-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t +-s,@LIBART_LIBS@,$LIBART_LIBS,;t t + s,@SUPPLY_BACKTRACE_TRUE@,$SUPPLY_BACKTRACE_TRUE,;t t + s,@SUPPLY_BACKTRACE_FALSE@,$SUPPLY_BACKTRACE_FALSE,;t t + s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t +--- libjava/Makefile.am ++++ libjava/Makefile.am +@@ -256,7 +256,7 @@ + lib_gnu_java_awt_peer_gtk_la_LIBADD = \ + gnu-java-awt-peer-gtk.lo \ + classpath/native/jni/gtk-peer/libgtkpeer.la \ +- $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) ++ $(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) + lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \ + classpath/native/jni/gtk-peer/libgtkpeer.la \ + libgcj-$(gcc_version).jar libgcj.la libgcj.spec +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -471,8 +471,6 @@ + JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ + JC1GCSPEC = @JC1GCSPEC@ + LDFLAGS = @LDFLAGS@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +@@ -746,7 +744,7 @@ + lib_gnu_java_awt_peer_gtk_la_LIBADD = \ + gnu-java-awt-peer-gtk.lo \ + classpath/native/jni/gtk-peer/libgtkpeer.la \ +- $(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) ++ $(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) + + lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \ + classpath/native/jni/gtk-peer/libgtkpeer.la \ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -143,8 +143,6 @@ + JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ + JC1GCSPEC = @JC1GCSPEC@ + LDFLAGS = @LDFLAGS@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -142,8 +142,6 @@ + JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ + JC1GCSPEC = @JC1GCSPEC@ + LDFLAGS = @LDFLAGS@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -131,8 +131,6 @@ + JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@ + JC1GCSPEC = @JC1GCSPEC@ + LDFLAGS = @LDFLAGS@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ --- files/gcc-4.2.0-delete-libart-check.patch +++ files/gcc-4.2.0-delete-libart-check.patch @@ -0,0 +1,188 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1138,10 +1138,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -310,7 +310,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -13947,107 +13947,6 @@ + + + +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- +-if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5 +-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6 +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- succeeded=yes +- +- echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5 +-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6 +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5 +-echo "${ECHO_T}$LIBART_CFLAGS" >&6 +- +- echo "$as_me:$LINENO: checking LIBART_LIBS" >&5 +-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6 +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5 +-echo "${ECHO_T}$LIBART_LIBS" >&6 +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +- + # We require the XTest Extension to support java.awt.Robot. + echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 + echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 +@@ -17802,8 +17701,6 @@ + s,@GTK_LIBS@,$GTK_LIBS,;t t + s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t + s,@GLIB_LIBS@,$GLIB_LIBS,;t t +-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t +-s,@LIBART_LIBS@,$LIBART_LIBS,;t t + s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t + s,@ac_ct_GCJ@,$ac_ct_GCJ,;t t + s,@ZLIBS@,$ZLIBS,;t t +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -534,8 +534,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -146,8 +146,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -145,8 +145,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -134,8 +134,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ --- files/gcc-4.3.2-delete-libart-check.patch +++ files/gcc-4.3.2-delete-libart-check.patch @@ -0,0 +1,188 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1260,10 +1260,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -459,7 +459,7 @@ + #endif" + + ac_subdirs_all="$ac_subdirs_all classpath libltdl" +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -25012,107 +25012,6 @@ + + + +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- +-if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5 +-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6 +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- succeeded=yes +- +- echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5 +-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6 +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5 +-echo "${ECHO_T}$LIBART_CFLAGS" >&6 +- +- echo "$as_me:$LINENO: checking LIBART_LIBS" >&5 +-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6 +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5 +-echo "${ECHO_T}$LIBART_LIBS" >&6 +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +- + # We require the XTest Extension to support java.awt.Robot. + echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 + echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 +@@ -29296,8 +29195,6 @@ + s,@GTK_LIBS@,$GTK_LIBS,;t t + s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t + s,@GLIB_LIBS@,$GLIB_LIBS,;t t +-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t +-s,@LIBART_LIBS@,$LIBART_LIBS,;t t + s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t + s,@ZLIBS@,$ZLIBS,;t t + s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -643,8 +643,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -166,8 +166,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -165,8 +165,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -154,8 +154,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ + LIBGCJDEBUG = @LIBGCJDEBUG@ --- files/gcc-4.4.5-delete-libart-check.patch +++ files/gcc-4.4.5-delete-libart-check.patch @@ -0,0 +1,188 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1364,10 +1364,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -460,7 +460,7 @@ + + ac_subdirs_all="$ac_subdirs_all classpath libltdl" + ac_c_werror_flag= +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_libsubdir build_subdir host_subdir target_subdir multi_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADSTARTFILESPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS CLASSPATH_SEPARATOR ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' + ac_subst_files='' + ac_pwd=`pwd` + +@@ -25334,107 +25334,6 @@ + + + +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-echo "$as_me:$LINENO: checking for $ac_word" >&5 +-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +- +-if test -n "$PKG_CONFIG"; then +- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +-echo "${ECHO_T}$PKG_CONFIG" >&6 +-else +- echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6 +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5 +-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6 +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6 +- succeeded=yes +- +- echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5 +-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6 +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5 +-echo "${ECHO_T}$LIBART_CFLAGS" >&6 +- +- echo "$as_me:$LINENO: checking LIBART_LIBS" >&5 +-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6 +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5 +-echo "${ECHO_T}$LIBART_LIBS" >&6 +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- { { echo "$as_me:$LINENO: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } +- fi +- +- +- +- + # We require the XTest Extension to support java.awt.Robot. + echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 + echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 +@@ -29944,8 +29843,6 @@ + s,@GTK_LIBS@,$GTK_LIBS,;t t + s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t + s,@GLIB_LIBS@,$GLIB_LIBS,;t t +-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t +-s,@LIBART_LIBS@,$LIBART_LIBS,;t t + s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t + s,@ZLIBS@,$ZLIBS,;t t + s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -604,8 +604,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -190,8 +190,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -189,8 +189,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -178,8 +178,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ --- files/gcc-4.5.0-delete-libart-check.patch +++ files/gcc-4.5.0-delete-libart-check.patch @@ -0,0 +1,178 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1390,10 +1390,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -662,8 +662,6 @@ + SYS_ZLIBS + ZLIBS + CLASSPATH_SEPARATOR +-LIBART_LIBS +-LIBART_CFLAGS + GLIB_LIBS + GLIB_CFLAGS + GTK_LIBS +@@ -22877,106 +22875,6 @@ + fi + + +- +- +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5 +-$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; } +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- succeeded=yes +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5 +-$as_echo_n "checking LIBART_CFLAGS... " >&6; } +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5 +-$as_echo "$LIBART_CFLAGS" >&6; } +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5 +-$as_echo_n "checking LIBART_LIBS... " >&6; } +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5 +-$as_echo "$LIBART_LIBS" >&6; } +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- as_fn_error "Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 +- fi +- +- + + + # We require the XTest Extension to support java.awt.Robot. +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -714,8 +714,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -178,8 +178,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -178,8 +178,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -153,8 +153,6 @@ + LDFLAGS = @LDFLAGS@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ --- files/gcc-4.8.2-delete-libart-check.patch +++ files/gcc-4.8.2-delete-libart-check.patch @@ -0,0 +1,235 @@ +https://bugs.gentoo.org/show_bug.cgi?id=513716 +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552 + +--- libjava/configure.ac ++++ libjava/configure.ac +@@ -1453,10 +1453,6 @@ + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +- PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) +- AC_SUBST(LIBART_CFLAGS) +- AC_SUBST(LIBART_LIBS) +- + # We require the XTest Extension to support java.awt.Robot. + AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], + [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], +--- libjava/configure ++++ libjava/configure +@@ -666,8 +666,6 @@ + SYS_ZLIBS + ZLIBS + CLASSPATH_SEPARATOR +-LIBART_LIBS +-LIBART_CFLAGS + GLIB_LIBS + GLIB_CFLAGS + GTK_LIBS +@@ -23114,163 +23112,6 @@ + fi + + +- +- +- +- succeeded=no +- +- if test -z "$PKG_CONFIG"; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-PKG_CONFIG=$ac_cv_path_PKG_CONFIG +-if test -n "$PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_path_PKG_CONFIG"; then +- ac_pt_PKG_CONFIG=$PKG_CONFIG +- # Extract the first word of "pkg-config", so it can be a program name with args. +-set dummy pkg-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $ac_pt_PKG_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- ;; +-esac +-fi +-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +-if test -n "$ac_pt_PKG_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +-$as_echo "$ac_pt_PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_pt_PKG_CONFIG" = x; then +- PKG_CONFIG="no" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- PKG_CONFIG=$ac_pt_PKG_CONFIG +- fi +-else +- PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +-fi +- +- fi +- +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** The pkg-config script could not be found. Make sure it is" +- echo "*** in your path, or set the PKG_CONFIG environment variable" +- echo "*** to the full path to pkg-config." +- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5 +-$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; } +- +- if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- succeeded=yes +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5 +-$as_echo_n "checking LIBART_CFLAGS... " >&6; } +- LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5 +-$as_echo "$LIBART_CFLAGS" >&6; } +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5 +-$as_echo_n "checking LIBART_LIBS... " >&6; } +- LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5 +-$as_echo "$LIBART_LIBS" >&6; } +- else +- LIBART_CFLAGS="" +- LIBART_LIBS="" +- ## If we have a custom action on failure, don't print errors, but +- ## do set a variable so people can do so. +- LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` +- echo $LIBART_PKG_ERRORS +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- : +- else +- as_fn_error "Library requirements (libart-2.0 >= 2.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 +- fi +- +- + + + # We require the XTest Extension to support java.awt.Robot. +--- libjava/Makefile.in ++++ libjava/Makefile.in +@@ -596,8 +596,6 @@ + LDLIBICONV = @LDLIBICONV@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/gcj/Makefile.in ++++ libjava/gcj/Makefile.in +@@ -177,8 +177,6 @@ + LDLIBICONV = @LDLIBICONV@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/include/Makefile.in ++++ libjava/include/Makefile.in +@@ -178,8 +178,6 @@ + LDLIBICONV = @LDLIBICONV@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ +--- libjava/testsuite/Makefile.in ++++ libjava/testsuite/Makefile.in +@@ -153,8 +153,6 @@ + LDLIBICONV = @LDLIBICONV@ + LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ + LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ + LIBDIR = @LIBDIR@ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ --- gcc-4.1.2.ebuild +++ gcc-4.1.2.ebuild @@ -23,6 +23,8 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.1.0-delete-libart-check.patch + # Fix cross-compiling epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch --- gcc-4.2.4-r1.ebuild +++ gcc-4.2.4-r1.ebuild @@ -16,3 +16,11 @@ ppc? ( >=${CATEGORY}/binutils-2.17 ) ppc64? ( >=${CATEGORY}/binutils-2.17 ) >=${CATEGORY}/binutils-2.15.94" + +src_prepare() { + toolchain_src_prepare + + use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.2.0-delete-libart-check.patch +} --- gcc-4.3.6-r1.ebuild +++ gcc-4.3.6-r1.ebuild @@ -25,5 +25,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.3.2-delete-libart-check.patch + sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200 } --- gcc-4.4.7.ebuild +++ gcc-4.4.7.ebuild @@ -23,8 +23,11 @@ src_prepare() { toolchain_src_prepare + use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.4.5-delete-libart-check.patch + sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200 [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch --- gcc-4.5.4.ebuild +++ gcc-4.5.4.ebuild @@ -26,6 +26,8 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200 [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch --- gcc-4.6.4.ebuild +++ gcc-4.6.4.ebuild @@ -44,5 +44,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.7.0.ebuild +++ gcc-4.7.0.ebuild @@ -47,5 +47,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.7.1.ebuild +++ gcc-4.7.1.ebuild @@ -47,5 +47,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.7.2-r1.ebuild +++ gcc-4.7.2-r1.ebuild @@ -47,5 +47,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.7.3-r1.ebuild +++ gcc-4.7.3-r1.ebuild @@ -47,5 +47,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.7.4.ebuild +++ gcc-4.7.4.ebuild @@ -47,5 +47,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.8.0.ebuild +++ gcc-4.8.0.ebuild @@ -44,5 +44,7 @@ use vanilla && return 0 + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch } --- gcc-4.8.1-r1.ebuild +++ gcc-4.8.1-r1.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.8.2.ebuild +++ gcc-4.8.2.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.8.3.ebuild +++ gcc-4.8.3.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.8.4.ebuild +++ gcc-4.8.4.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.9.0.ebuild +++ gcc-4.9.0.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.9.1.ebuild +++ gcc-4.9.1.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-4.9.2.ebuild +++ gcc-4.9.2.ebuild @@ -43,6 +43,9 @@ toolchain_src_prepare use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch + #Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs. [[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch } --- gcc-5.1.0.ebuild +++ gcc-5.1.0.ebuild @@ -42,4 +42,8 @@ is_crosscompile && EPATCH_EXCLUDE+=" 05_all_gcc-spec-env.patch" toolchain_src_prepare + + use vanilla && return 0 + + epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch }