Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 513716 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-31 / +1279 lines)
Line  Link Here
0
-- files/gcc-4.1.0-delete-libart-check.patch
0
++ files/gcc-4.1.0-delete-libart-check.patch
Line 0 Link Here
0
-- files/gcc-4.2.0-delete-libart-check.patch
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1141,10 +1141,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -310,7 +310,7 @@
20
 # include <unistd.h>
21
 #endif"
22
 
23
-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'
24
+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'
25
 ac_subst_files=''
26
 
27
 # Initialize some variables set by options.
28
@@ -13729,107 +13729,6 @@
29
 
30
 
31
 
32
-
33
-  succeeded=no
34
-
35
-  if test -z "$PKG_CONFIG"; then
36
-    # Extract the first word of "pkg-config", so it can be a program name with args.
37
-set dummy pkg-config; ac_word=$2
38
-echo "$as_me:$LINENO: checking for $ac_word" >&5
39
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
40
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
41
-  echo $ECHO_N "(cached) $ECHO_C" >&6
42
-else
43
-  case $PKG_CONFIG in
44
-  [\\/]* | ?:[\\/]*)
45
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
46
-  ;;
47
-  *)
48
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
49
-for as_dir in $PATH
50
-do
51
-  IFS=$as_save_IFS
52
-  test -z "$as_dir" && as_dir=.
53
-  for ac_exec_ext in '' $ac_executable_extensions; do
54
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
56
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
57
-    break 2
58
-  fi
59
-done
60
-done
61
-
62
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
63
-  ;;
64
-esac
65
-fi
66
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
67
-
68
-if test -n "$PKG_CONFIG"; then
69
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
70
-echo "${ECHO_T}$PKG_CONFIG" >&6
71
-else
72
-  echo "$as_me:$LINENO: result: no" >&5
73
-echo "${ECHO_T}no" >&6
74
-fi
75
-
76
-  fi
77
-
78
-  if test "$PKG_CONFIG" = "no" ; then
79
-     echo "*** The pkg-config script could not be found. Make sure it is"
80
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
81
-     echo "*** to the full path to pkg-config."
82
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
83
-  else
84
-     PKG_CONFIG_MIN_VERSION=0.9.0
85
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
86
-        echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
87
-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
88
-
89
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
90
-            echo "$as_me:$LINENO: result: yes" >&5
91
-echo "${ECHO_T}yes" >&6
92
-            succeeded=yes
93
-
94
-            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
95
-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
96
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
97
-            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
98
-echo "${ECHO_T}$LIBART_CFLAGS" >&6
99
-
100
-            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
101
-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
102
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
103
-            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
104
-echo "${ECHO_T}$LIBART_LIBS" >&6
105
-        else
106
-            LIBART_CFLAGS=""
107
-            LIBART_LIBS=""
108
-            ## If we have a custom action on failure, don't print errors, but
109
-            ## do set a variable so people can do so.
110
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
111
-            echo $LIBART_PKG_ERRORS
112
-        fi
113
-
114
-
115
-
116
-     else
117
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
118
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
119
-     fi
120
-  fi
121
-
122
-  if test $succeeded = yes; then
123
-     :
124
-  else
125
-     { { 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
126
-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;}
127
-   { (exit 1); exit 1; }; }
128
-  fi
129
-
130
-
131
-
132
-
133
       # We require the XTest Extension to support java.awt.Robot.
134
       echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
135
 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
136
@@ -17876,8 +17775,6 @@
137
 s,@GTK_LIBS@,$GTK_LIBS,;t t
138
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
139
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
140
-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
141
-s,@LIBART_LIBS@,$LIBART_LIBS,;t t
142
 s,@SUPPLY_BACKTRACE_TRUE@,$SUPPLY_BACKTRACE_TRUE,;t t
143
 s,@SUPPLY_BACKTRACE_FALSE@,$SUPPLY_BACKTRACE_FALSE,;t t
144
 s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
145
--- libjava/Makefile.am
146
+++ libjava/Makefile.am
147
@@ -256,7 +256,7 @@
148
 lib_gnu_java_awt_peer_gtk_la_LIBADD = \
149
 	gnu-java-awt-peer-gtk.lo \
150
 	classpath/native/jni/gtk-peer/libgtkpeer.la \
151
-	$(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
152
+	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
153
 lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
154
 	classpath/native/jni/gtk-peer/libgtkpeer.la \
155
 	libgcj-$(gcc_version).jar libgcj.la libgcj.spec
156
--- libjava/Makefile.in
157
+++ libjava/Makefile.in
158
@@ -471,8 +471,6 @@
159
 JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
160
 JC1GCSPEC = @JC1GCSPEC@
161
 LDFLAGS = @LDFLAGS@
162
-LIBART_CFLAGS = @LIBART_CFLAGS@
163
-LIBART_LIBS = @LIBART_LIBS@
164
 LIBFFI = @LIBFFI@
165
 LIBFFIINCS = @LIBFFIINCS@
166
 LIBGCJDEBUG = @LIBGCJDEBUG@
167
@@ -746,7 +744,7 @@
168
 lib_gnu_java_awt_peer_gtk_la_LIBADD = \
169
 	gnu-java-awt-peer-gtk.lo \
170
 	classpath/native/jni/gtk-peer/libgtkpeer.la \
171
-	$(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
172
+	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
173
 
174
 lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
175
 	classpath/native/jni/gtk-peer/libgtkpeer.la \
176
--- libjava/gcj/Makefile.in
177
+++ libjava/gcj/Makefile.in
178
@@ -143,8 +143,6 @@
179
 JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
180
 JC1GCSPEC = @JC1GCSPEC@
181
 LDFLAGS = @LDFLAGS@
182
-LIBART_CFLAGS = @LIBART_CFLAGS@
183
-LIBART_LIBS = @LIBART_LIBS@
184
 LIBFFI = @LIBFFI@
185
 LIBFFIINCS = @LIBFFIINCS@
186
 LIBGCJDEBUG = @LIBGCJDEBUG@
187
--- libjava/include/Makefile.in
188
+++ libjava/include/Makefile.in
189
@@ -142,8 +142,6 @@
190
 JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
191
 JC1GCSPEC = @JC1GCSPEC@
192
 LDFLAGS = @LDFLAGS@
193
-LIBART_CFLAGS = @LIBART_CFLAGS@
194
-LIBART_LIBS = @LIBART_LIBS@
195
 LIBFFI = @LIBFFI@
196
 LIBFFIINCS = @LIBFFIINCS@
197
 LIBGCJDEBUG = @LIBGCJDEBUG@
198
--- libjava/testsuite/Makefile.in
199
+++ libjava/testsuite/Makefile.in
200
@@ -131,8 +131,6 @@
201
 JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
202
 JC1GCSPEC = @JC1GCSPEC@
203
 LDFLAGS = @LDFLAGS@
204
-LIBART_CFLAGS = @LIBART_CFLAGS@
205
-LIBART_LIBS = @LIBART_LIBS@
206
 LIBFFI = @LIBFFI@
207
 LIBFFIINCS = @LIBFFIINCS@
208
 LIBGCJDEBUG = @LIBGCJDEBUG@
209
++ files/gcc-4.2.0-delete-libart-check.patch
Line 0 Link Here
0
-- files/gcc-4.3.2-delete-libart-check.patch
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1138,10 +1138,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -310,7 +310,7 @@
20
 # include <unistd.h>
21
 #endif"
22
 
23
-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'
24
+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'
25
 ac_subst_files=''
26
 
27
 # Initialize some variables set by options.
28
@@ -13947,107 +13947,6 @@
29
 
30
 
31
 
32
-
33
-  succeeded=no
34
-
35
-  if test -z "$PKG_CONFIG"; then
36
-    # Extract the first word of "pkg-config", so it can be a program name with args.
37
-set dummy pkg-config; ac_word=$2
38
-echo "$as_me:$LINENO: checking for $ac_word" >&5
39
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
40
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
41
-  echo $ECHO_N "(cached) $ECHO_C" >&6
42
-else
43
-  case $PKG_CONFIG in
44
-  [\\/]* | ?:[\\/]*)
45
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
46
-  ;;
47
-  *)
48
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
49
-for as_dir in $PATH
50
-do
51
-  IFS=$as_save_IFS
52
-  test -z "$as_dir" && as_dir=.
53
-  for ac_exec_ext in '' $ac_executable_extensions; do
54
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
56
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
57
-    break 2
58
-  fi
59
-done
60
-done
61
-
62
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
63
-  ;;
64
-esac
65
-fi
66
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
67
-
68
-if test -n "$PKG_CONFIG"; then
69
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
70
-echo "${ECHO_T}$PKG_CONFIG" >&6
71
-else
72
-  echo "$as_me:$LINENO: result: no" >&5
73
-echo "${ECHO_T}no" >&6
74
-fi
75
-
76
-  fi
77
-
78
-  if test "$PKG_CONFIG" = "no" ; then
79
-     echo "*** The pkg-config script could not be found. Make sure it is"
80
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
81
-     echo "*** to the full path to pkg-config."
82
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
83
-  else
84
-     PKG_CONFIG_MIN_VERSION=0.9.0
85
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
86
-        echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
87
-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
88
-
89
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
90
-            echo "$as_me:$LINENO: result: yes" >&5
91
-echo "${ECHO_T}yes" >&6
92
-            succeeded=yes
93
-
94
-            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
95
-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
96
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
97
-            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
98
-echo "${ECHO_T}$LIBART_CFLAGS" >&6
99
-
100
-            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
101
-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
102
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
103
-            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
104
-echo "${ECHO_T}$LIBART_LIBS" >&6
105
-        else
106
-            LIBART_CFLAGS=""
107
-            LIBART_LIBS=""
108
-            ## If we have a custom action on failure, don't print errors, but
109
-            ## do set a variable so people can do so.
110
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
111
-            echo $LIBART_PKG_ERRORS
112
-        fi
113
-
114
-
115
-
116
-     else
117
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
118
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
119
-     fi
120
-  fi
121
-
122
-  if test $succeeded = yes; then
123
-     :
124
-  else
125
-     { { 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
126
-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;}
127
-   { (exit 1); exit 1; }; }
128
-  fi
129
-
130
-
131
-
132
-
133
       # We require the XTest Extension to support java.awt.Robot.
134
       echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
135
 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
136
@@ -17802,8 +17701,6 @@
137
 s,@GTK_LIBS@,$GTK_LIBS,;t t
138
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
139
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
140
-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
141
-s,@LIBART_LIBS@,$LIBART_LIBS,;t t
142
 s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
143
 s,@ac_ct_GCJ@,$ac_ct_GCJ,;t t
144
 s,@ZLIBS@,$ZLIBS,;t t
145
--- libjava/Makefile.in
146
+++ libjava/Makefile.in
147
@@ -534,8 +534,6 @@
148
 LDFLAGS = @LDFLAGS@
149
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
150
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
151
-LIBART_CFLAGS = @LIBART_CFLAGS@
152
-LIBART_LIBS = @LIBART_LIBS@
153
 LIBFFI = @LIBFFI@
154
 LIBFFIINCS = @LIBFFIINCS@
155
 LIBGCJDEBUG = @LIBGCJDEBUG@
156
--- libjava/gcj/Makefile.in
157
+++ libjava/gcj/Makefile.in
158
@@ -146,8 +146,6 @@
159
 LDFLAGS = @LDFLAGS@
160
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
161
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
162
-LIBART_CFLAGS = @LIBART_CFLAGS@
163
-LIBART_LIBS = @LIBART_LIBS@
164
 LIBFFI = @LIBFFI@
165
 LIBFFIINCS = @LIBFFIINCS@
166
 LIBGCJDEBUG = @LIBGCJDEBUG@
167
--- libjava/include/Makefile.in
168
+++ libjava/include/Makefile.in
169
@@ -145,8 +145,6 @@
170
 LDFLAGS = @LDFLAGS@
171
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
172
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
173
-LIBART_CFLAGS = @LIBART_CFLAGS@
174
-LIBART_LIBS = @LIBART_LIBS@
175
 LIBFFI = @LIBFFI@
176
 LIBFFIINCS = @LIBFFIINCS@
177
 LIBGCJDEBUG = @LIBGCJDEBUG@
178
--- libjava/testsuite/Makefile.in
179
+++ libjava/testsuite/Makefile.in
180
@@ -134,8 +134,6 @@
181
 LDFLAGS = @LDFLAGS@
182
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
183
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
184
-LIBART_CFLAGS = @LIBART_CFLAGS@
185
-LIBART_LIBS = @LIBART_LIBS@
186
 LIBFFI = @LIBFFI@
187
 LIBFFIINCS = @LIBFFIINCS@
188
 LIBGCJDEBUG = @LIBGCJDEBUG@
189
++ files/gcc-4.3.2-delete-libart-check.patch
Line 0 Link Here
0
-- files/gcc-4.4.5-delete-libart-check.patch
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1260,10 +1260,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -459,7 +459,7 @@
20
 #endif"
21
 
22
 ac_subdirs_all="$ac_subdirs_all classpath libltdl"
23
-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'
24
+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'
25
 ac_subst_files=''
26
 
27
 # Initialize some variables set by options.
28
@@ -25012,107 +25012,6 @@
29
 
30
 
31
 
32
-
33
-  succeeded=no
34
-
35
-  if test -z "$PKG_CONFIG"; then
36
-    # Extract the first word of "pkg-config", so it can be a program name with args.
37
-set dummy pkg-config; ac_word=$2
38
-echo "$as_me:$LINENO: checking for $ac_word" >&5
39
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
40
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
41
-  echo $ECHO_N "(cached) $ECHO_C" >&6
42
-else
43
-  case $PKG_CONFIG in
44
-  [\\/]* | ?:[\\/]*)
45
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
46
-  ;;
47
-  *)
48
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
49
-for as_dir in $PATH
50
-do
51
-  IFS=$as_save_IFS
52
-  test -z "$as_dir" && as_dir=.
53
-  for ac_exec_ext in '' $ac_executable_extensions; do
54
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
56
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
57
-    break 2
58
-  fi
59
-done
60
-done
61
-
62
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
63
-  ;;
64
-esac
65
-fi
66
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
67
-
68
-if test -n "$PKG_CONFIG"; then
69
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
70
-echo "${ECHO_T}$PKG_CONFIG" >&6
71
-else
72
-  echo "$as_me:$LINENO: result: no" >&5
73
-echo "${ECHO_T}no" >&6
74
-fi
75
-
76
-  fi
77
-
78
-  if test "$PKG_CONFIG" = "no" ; then
79
-     echo "*** The pkg-config script could not be found. Make sure it is"
80
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
81
-     echo "*** to the full path to pkg-config."
82
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
83
-  else
84
-     PKG_CONFIG_MIN_VERSION=0.9.0
85
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
86
-        echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
87
-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
88
-
89
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
90
-            echo "$as_me:$LINENO: result: yes" >&5
91
-echo "${ECHO_T}yes" >&6
92
-            succeeded=yes
93
-
94
-            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
95
-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
96
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
97
-            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
98
-echo "${ECHO_T}$LIBART_CFLAGS" >&6
99
-
100
-            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
101
-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
102
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
103
-            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
104
-echo "${ECHO_T}$LIBART_LIBS" >&6
105
-        else
106
-            LIBART_CFLAGS=""
107
-            LIBART_LIBS=""
108
-            ## If we have a custom action on failure, don't print errors, but
109
-            ## do set a variable so people can do so.
110
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
111
-            echo $LIBART_PKG_ERRORS
112
-        fi
113
-
114
-
115
-
116
-     else
117
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
118
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
119
-     fi
120
-  fi
121
-
122
-  if test $succeeded = yes; then
123
-     :
124
-  else
125
-     { { 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
126
-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;}
127
-   { (exit 1); exit 1; }; }
128
-  fi
129
-
130
-
131
-
132
-
133
       # We require the XTest Extension to support java.awt.Robot.
134
       echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
135
 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
136
@@ -29296,8 +29195,6 @@
137
 s,@GTK_LIBS@,$GTK_LIBS,;t t
138
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
139
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
140
-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
141
-s,@LIBART_LIBS@,$LIBART_LIBS,;t t
142
 s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
143
 s,@ZLIBS@,$ZLIBS,;t t
144
 s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t
145
--- libjava/Makefile.in
146
+++ libjava/Makefile.in
147
@@ -643,8 +643,6 @@
148
 LDFLAGS = @LDFLAGS@
149
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
150
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
151
-LIBART_CFLAGS = @LIBART_CFLAGS@
152
-LIBART_LIBS = @LIBART_LIBS@
153
 LIBFFI = @LIBFFI@
154
 LIBFFIINCS = @LIBFFIINCS@
155
 LIBGCJDEBUG = @LIBGCJDEBUG@
156
--- libjava/gcj/Makefile.in
157
+++ libjava/gcj/Makefile.in
158
@@ -166,8 +166,6 @@
159
 LDFLAGS = @LDFLAGS@
160
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
161
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
162
-LIBART_CFLAGS = @LIBART_CFLAGS@
163
-LIBART_LIBS = @LIBART_LIBS@
164
 LIBFFI = @LIBFFI@
165
 LIBFFIINCS = @LIBFFIINCS@
166
 LIBGCJDEBUG = @LIBGCJDEBUG@
167
--- libjava/include/Makefile.in
168
+++ libjava/include/Makefile.in
169
@@ -165,8 +165,6 @@
170
 LDFLAGS = @LDFLAGS@
171
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
172
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
173
-LIBART_CFLAGS = @LIBART_CFLAGS@
174
-LIBART_LIBS = @LIBART_LIBS@
175
 LIBFFI = @LIBFFI@
176
 LIBFFIINCS = @LIBFFIINCS@
177
 LIBGCJDEBUG = @LIBGCJDEBUG@
178
--- libjava/testsuite/Makefile.in
179
+++ libjava/testsuite/Makefile.in
180
@@ -154,8 +154,6 @@
181
 LDFLAGS = @LDFLAGS@
182
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
183
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
184
-LIBART_CFLAGS = @LIBART_CFLAGS@
185
-LIBART_LIBS = @LIBART_LIBS@
186
 LIBFFI = @LIBFFI@
187
 LIBFFIINCS = @LIBFFIINCS@
188
 LIBGCJDEBUG = @LIBGCJDEBUG@
189
++ files/gcc-4.4.5-delete-libart-check.patch
Line 0 Link Here
0
-- files/gcc-4.5.0-delete-libart-check.patch
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1364,10 +1364,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -460,7 +460,7 @@
20
 
21
 ac_subdirs_all="$ac_subdirs_all classpath libltdl"
22
 ac_c_werror_flag=
23
-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'
24
+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'
25
 ac_subst_files=''
26
 ac_pwd=`pwd`
27
 
28
@@ -25334,107 +25334,6 @@
29
 
30
 
31
 
32
-
33
-  succeeded=no
34
-
35
-  if test -z "$PKG_CONFIG"; then
36
-    # Extract the first word of "pkg-config", so it can be a program name with args.
37
-set dummy pkg-config; ac_word=$2
38
-echo "$as_me:$LINENO: checking for $ac_word" >&5
39
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
40
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
41
-  echo $ECHO_N "(cached) $ECHO_C" >&6
42
-else
43
-  case $PKG_CONFIG in
44
-  [\\/]* | ?:[\\/]*)
45
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
46
-  ;;
47
-  *)
48
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
49
-for as_dir in $PATH
50
-do
51
-  IFS=$as_save_IFS
52
-  test -z "$as_dir" && as_dir=.
53
-  for ac_exec_ext in '' $ac_executable_extensions; do
54
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
56
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
57
-    break 2
58
-  fi
59
-done
60
-done
61
-
62
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
63
-  ;;
64
-esac
65
-fi
66
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
67
-
68
-if test -n "$PKG_CONFIG"; then
69
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
70
-echo "${ECHO_T}$PKG_CONFIG" >&6
71
-else
72
-  echo "$as_me:$LINENO: result: no" >&5
73
-echo "${ECHO_T}no" >&6
74
-fi
75
-
76
-  fi
77
-
78
-  if test "$PKG_CONFIG" = "no" ; then
79
-     echo "*** The pkg-config script could not be found. Make sure it is"
80
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
81
-     echo "*** to the full path to pkg-config."
82
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
83
-  else
84
-     PKG_CONFIG_MIN_VERSION=0.9.0
85
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
86
-        echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
87
-echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
88
-
89
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
90
-            echo "$as_me:$LINENO: result: yes" >&5
91
-echo "${ECHO_T}yes" >&6
92
-            succeeded=yes
93
-
94
-            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
95
-echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
96
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
97
-            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
98
-echo "${ECHO_T}$LIBART_CFLAGS" >&6
99
-
100
-            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
101
-echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
102
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
103
-            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
104
-echo "${ECHO_T}$LIBART_LIBS" >&6
105
-        else
106
-            LIBART_CFLAGS=""
107
-            LIBART_LIBS=""
108
-            ## If we have a custom action on failure, don't print errors, but
109
-            ## do set a variable so people can do so.
110
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
111
-            echo $LIBART_PKG_ERRORS
112
-        fi
113
-
114
-
115
-
116
-     else
117
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
118
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
119
-     fi
120
-  fi
121
-
122
-  if test $succeeded = yes; then
123
-     :
124
-  else
125
-     { { 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
126
-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;}
127
-   { (exit 1); exit 1; }; }
128
-  fi
129
-
130
-
131
-
132
-
133
       # We require the XTest Extension to support java.awt.Robot.
134
       echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
135
 echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
136
@@ -29944,8 +29843,6 @@
137
 s,@GTK_LIBS@,$GTK_LIBS,;t t
138
 s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
139
 s,@GLIB_LIBS@,$GLIB_LIBS,;t t
140
-s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
141
-s,@LIBART_LIBS@,$LIBART_LIBS,;t t
142
 s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
143
 s,@ZLIBS@,$ZLIBS,;t t
144
 s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t
145
--- libjava/Makefile.in
146
+++ libjava/Makefile.in
147
@@ -604,8 +604,6 @@
148
 LDFLAGS = @LDFLAGS@
149
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
150
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
151
-LIBART_CFLAGS = @LIBART_CFLAGS@
152
-LIBART_LIBS = @LIBART_LIBS@
153
 LIBDIR = @LIBDIR@
154
 LIBFFI = @LIBFFI@
155
 LIBFFIINCS = @LIBFFIINCS@
156
--- libjava/gcj/Makefile.in
157
+++ libjava/gcj/Makefile.in
158
@@ -190,8 +190,6 @@
159
 LDFLAGS = @LDFLAGS@
160
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
161
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
162
-LIBART_CFLAGS = @LIBART_CFLAGS@
163
-LIBART_LIBS = @LIBART_LIBS@
164
 LIBDIR = @LIBDIR@
165
 LIBFFI = @LIBFFI@
166
 LIBFFIINCS = @LIBFFIINCS@
167
--- libjava/include/Makefile.in
168
+++ libjava/include/Makefile.in
169
@@ -189,8 +189,6 @@
170
 LDFLAGS = @LDFLAGS@
171
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
172
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
173
-LIBART_CFLAGS = @LIBART_CFLAGS@
174
-LIBART_LIBS = @LIBART_LIBS@
175
 LIBDIR = @LIBDIR@
176
 LIBFFI = @LIBFFI@
177
 LIBFFIINCS = @LIBFFIINCS@
178
--- libjava/testsuite/Makefile.in
179
+++ libjava/testsuite/Makefile.in
180
@@ -178,8 +178,6 @@
181
 LDFLAGS = @LDFLAGS@
182
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
183
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
184
-LIBART_CFLAGS = @LIBART_CFLAGS@
185
-LIBART_LIBS = @LIBART_LIBS@
186
 LIBDIR = @LIBDIR@
187
 LIBFFI = @LIBFFI@
188
 LIBFFIINCS = @LIBFFIINCS@
189
++ files/gcc-4.5.0-delete-libart-check.patch
Line 0 Link Here
0
-- files/gcc-4.8.2-delete-libart-check.patch
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1390,10 +1390,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -662,8 +662,6 @@
20
 SYS_ZLIBS
21
 ZLIBS
22
 CLASSPATH_SEPARATOR
23
-LIBART_LIBS
24
-LIBART_CFLAGS
25
 GLIB_LIBS
26
 GLIB_CFLAGS
27
 GTK_LIBS
28
@@ -22877,106 +22875,6 @@
29
   fi
30
 
31
 
32
-
33
-
34
-
35
-  succeeded=no
36
-
37
-  if test -z "$PKG_CONFIG"; then
38
-    # Extract the first word of "pkg-config", so it can be a program name with args.
39
-set dummy pkg-config; ac_word=$2
40
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
41
-$as_echo_n "checking for $ac_word... " >&6; }
42
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
43
-  $as_echo_n "(cached) " >&6
44
-else
45
-  case $PKG_CONFIG in
46
-  [\\/]* | ?:[\\/]*)
47
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
48
-  ;;
49
-  *)
50
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
51
-for as_dir in $PATH
52
-do
53
-  IFS=$as_save_IFS
54
-  test -z "$as_dir" && as_dir=.
55
-    for ac_exec_ext in '' $ac_executable_extensions; do
56
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
57
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
58
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
59
-    break 2
60
-  fi
61
-done
62
-  done
63
-IFS=$as_save_IFS
64
-
65
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
66
-  ;;
67
-esac
68
-fi
69
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
70
-if test -n "$PKG_CONFIG"; then
71
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
72
-$as_echo "$PKG_CONFIG" >&6; }
73
-else
74
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
75
-$as_echo "no" >&6; }
76
-fi
77
-
78
-
79
-  fi
80
-
81
-  if test "$PKG_CONFIG" = "no" ; then
82
-     echo "*** The pkg-config script could not be found. Make sure it is"
83
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
84
-     echo "*** to the full path to pkg-config."
85
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
86
-  else
87
-     PKG_CONFIG_MIN_VERSION=0.9.0
88
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
89
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5
90
-$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; }
91
-
92
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
93
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
94
-$as_echo "yes" >&6; }
95
-            succeeded=yes
96
-
97
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5
98
-$as_echo_n "checking LIBART_CFLAGS... " >&6; }
99
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
100
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5
101
-$as_echo "$LIBART_CFLAGS" >&6; }
102
-
103
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5
104
-$as_echo_n "checking LIBART_LIBS... " >&6; }
105
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
106
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5
107
-$as_echo "$LIBART_LIBS" >&6; }
108
-        else
109
-            LIBART_CFLAGS=""
110
-            LIBART_LIBS=""
111
-            ## If we have a custom action on failure, don't print errors, but
112
-            ## do set a variable so people can do so.
113
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
114
-            echo $LIBART_PKG_ERRORS
115
-        fi
116
-
117
-
118
-
119
-     else
120
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
121
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
122
-     fi
123
-  fi
124
-
125
-  if test $succeeded = yes; then
126
-     :
127
-  else
128
-     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
129
-  fi
130
-
131
-
132
 
133
 
134
       # We require the XTest Extension to support java.awt.Robot.
135
--- libjava/Makefile.in
136
+++ libjava/Makefile.in
137
@@ -714,8 +714,6 @@
138
 LDFLAGS = @LDFLAGS@
139
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
140
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
141
-LIBART_CFLAGS = @LIBART_CFLAGS@
142
-LIBART_LIBS = @LIBART_LIBS@
143
 LIBDIR = @LIBDIR@
144
 LIBFFI = @LIBFFI@
145
 LIBFFIINCS = @LIBFFIINCS@
146
--- libjava/gcj/Makefile.in
147
+++ libjava/gcj/Makefile.in
148
@@ -178,8 +178,6 @@
149
 LDFLAGS = @LDFLAGS@
150
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
151
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
152
-LIBART_CFLAGS = @LIBART_CFLAGS@
153
-LIBART_LIBS = @LIBART_LIBS@
154
 LIBDIR = @LIBDIR@
155
 LIBFFI = @LIBFFI@
156
 LIBFFIINCS = @LIBFFIINCS@
157
--- libjava/include/Makefile.in
158
+++ libjava/include/Makefile.in
159
@@ -178,8 +178,6 @@
160
 LDFLAGS = @LDFLAGS@
161
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
162
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
163
-LIBART_CFLAGS = @LIBART_CFLAGS@
164
-LIBART_LIBS = @LIBART_LIBS@
165
 LIBDIR = @LIBDIR@
166
 LIBFFI = @LIBFFI@
167
 LIBFFIINCS = @LIBFFIINCS@
168
--- libjava/testsuite/Makefile.in
169
+++ libjava/testsuite/Makefile.in
170
@@ -153,8 +153,6 @@
171
 LDFLAGS = @LDFLAGS@
172
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
173
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
174
-LIBART_CFLAGS = @LIBART_CFLAGS@
175
-LIBART_LIBS = @LIBART_LIBS@
176
 LIBDIR = @LIBDIR@
177
 LIBFFI = @LIBFFI@
178
 LIBFFIINCS = @LIBFFIINCS@
179
++ files/gcc-4.8.2-delete-libart-check.patch
Line 0 Link Here
0
-- gcc-4.1.2.ebuild
1
https://bugs.gentoo.org/show_bug.cgi?id=513716
2
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61552
3
4
--- libjava/configure.ac
5
+++ libjava/configure.ac
6
@@ -1453,10 +1453,6 @@
7
       AC_SUBST(GLIB_CFLAGS)
8
       AC_SUBST(GLIB_LIBS)
9
 
10
-      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
11
-      AC_SUBST(LIBART_CFLAGS)
12
-      AC_SUBST(LIBART_LIBS)
13
-
14
       # We require the XTest Extension to support java.awt.Robot.
15
       AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
16
 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
17
--- libjava/configure
18
+++ libjava/configure
19
@@ -666,8 +666,6 @@
20
 SYS_ZLIBS
21
 ZLIBS
22
 CLASSPATH_SEPARATOR
23
-LIBART_LIBS
24
-LIBART_CFLAGS
25
 GLIB_LIBS
26
 GLIB_CFLAGS
27
 GTK_LIBS
28
@@ -23114,163 +23112,6 @@
29
   fi
30
 
31
 
32
-
33
-
34
-
35
-  succeeded=no
36
-
37
-  if test -z "$PKG_CONFIG"; then
38
-    if test -n "$ac_tool_prefix"; then
39
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
40
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
41
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
42
-$as_echo_n "checking for $ac_word... " >&6; }
43
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
44
-  $as_echo_n "(cached) " >&6
45
-else
46
-  case $PKG_CONFIG in
47
-  [\\/]* | ?:[\\/]*)
48
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
49
-  ;;
50
-  *)
51
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
52
-for as_dir in $PATH
53
-do
54
-  IFS=$as_save_IFS
55
-  test -z "$as_dir" && as_dir=.
56
-    for ac_exec_ext in '' $ac_executable_extensions; do
57
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
58
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
59
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
60
-    break 2
61
-  fi
62
-done
63
-  done
64
-IFS=$as_save_IFS
65
-
66
-  ;;
67
-esac
68
-fi
69
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
70
-if test -n "$PKG_CONFIG"; then
71
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
72
-$as_echo "$PKG_CONFIG" >&6; }
73
-else
74
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
75
-$as_echo "no" >&6; }
76
-fi
77
-
78
-
79
-fi
80
-if test -z "$ac_cv_path_PKG_CONFIG"; then
81
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
82
-  # Extract the first word of "pkg-config", so it can be a program name with args.
83
-set dummy pkg-config; ac_word=$2
84
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
85
-$as_echo_n "checking for $ac_word... " >&6; }
86
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
87
-  $as_echo_n "(cached) " >&6
88
-else
89
-  case $ac_pt_PKG_CONFIG in
90
-  [\\/]* | ?:[\\/]*)
91
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
92
-  ;;
93
-  *)
94
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
95
-for as_dir in $PATH
96
-do
97
-  IFS=$as_save_IFS
98
-  test -z "$as_dir" && as_dir=.
99
-    for ac_exec_ext in '' $ac_executable_extensions; do
100
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
101
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
102
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
103
-    break 2
104
-  fi
105
-done
106
-  done
107
-IFS=$as_save_IFS
108
-
109
-  ;;
110
-esac
111
-fi
112
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
113
-if test -n "$ac_pt_PKG_CONFIG"; then
114
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
115
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
116
-else
117
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
118
-$as_echo "no" >&6; }
119
-fi
120
-
121
-  if test "x$ac_pt_PKG_CONFIG" = x; then
122
-    PKG_CONFIG="no"
123
-  else
124
-    case $cross_compiling:$ac_tool_warned in
125
-yes:)
126
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
127
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
128
-ac_tool_warned=yes ;;
129
-esac
130
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
131
-  fi
132
-else
133
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
134
-fi
135
-
136
-  fi
137
-
138
-  if test "$PKG_CONFIG" = "no" ; then
139
-     echo "*** The pkg-config script could not be found. Make sure it is"
140
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
141
-     echo "*** to the full path to pkg-config."
142
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
143
-  else
144
-     PKG_CONFIG_MIN_VERSION=0.9.0
145
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
146
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5
147
-$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; }
148
-
149
-        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
150
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
151
-$as_echo "yes" >&6; }
152
-            succeeded=yes
153
-
154
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5
155
-$as_echo_n "checking LIBART_CFLAGS... " >&6; }
156
-            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
157
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5
158
-$as_echo "$LIBART_CFLAGS" >&6; }
159
-
160
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5
161
-$as_echo_n "checking LIBART_LIBS... " >&6; }
162
-            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
163
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5
164
-$as_echo "$LIBART_LIBS" >&6; }
165
-        else
166
-            LIBART_CFLAGS=""
167
-            LIBART_LIBS=""
168
-            ## If we have a custom action on failure, don't print errors, but
169
-            ## do set a variable so people can do so.
170
-            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
171
-            echo $LIBART_PKG_ERRORS
172
-        fi
173
-
174
-
175
-
176
-     else
177
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
178
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
179
-     fi
180
-  fi
181
-
182
-  if test $succeeded = yes; then
183
-     :
184
-  else
185
-     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
186
-  fi
187
-
188
-
189
 
190
 
191
       # We require the XTest Extension to support java.awt.Robot.
192
--- libjava/Makefile.in
193
+++ libjava/Makefile.in
194
@@ -596,8 +596,6 @@
195
 LDLIBICONV = @LDLIBICONV@
196
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
197
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
198
-LIBART_CFLAGS = @LIBART_CFLAGS@
199
-LIBART_LIBS = @LIBART_LIBS@
200
 LIBDIR = @LIBDIR@
201
 LIBFFI = @LIBFFI@
202
 LIBFFIINCS = @LIBFFIINCS@
203
--- libjava/gcj/Makefile.in
204
+++ libjava/gcj/Makefile.in
205
@@ -177,8 +177,6 @@
206
 LDLIBICONV = @LDLIBICONV@
207
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
208
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
209
-LIBART_CFLAGS = @LIBART_CFLAGS@
210
-LIBART_LIBS = @LIBART_LIBS@
211
 LIBDIR = @LIBDIR@
212
 LIBFFI = @LIBFFI@
213
 LIBFFIINCS = @LIBFFIINCS@
214
--- libjava/include/Makefile.in
215
+++ libjava/include/Makefile.in
216
@@ -178,8 +178,6 @@
217
 LDLIBICONV = @LDLIBICONV@
218
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
219
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
220
-LIBART_CFLAGS = @LIBART_CFLAGS@
221
-LIBART_LIBS = @LIBART_LIBS@
222
 LIBDIR = @LIBDIR@
223
 LIBFFI = @LIBFFI@
224
 LIBFFIINCS = @LIBFFIINCS@
225
--- libjava/testsuite/Makefile.in
226
+++ libjava/testsuite/Makefile.in
227
@@ -153,8 +153,6 @@
228
 LDLIBICONV = @LDLIBICONV@
229
 LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
230
 LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
231
-LIBART_CFLAGS = @LIBART_CFLAGS@
232
-LIBART_LIBS = @LIBART_LIBS@
233
 LIBDIR = @LIBDIR@
234
 LIBFFI = @LIBFFI@
235
 LIBFFIINCS = @LIBFFIINCS@
236
++ gcc-4.1.2.ebuild
Lines 23-28 Link Here
23
23
24
	use vanilla && return 0
24
	use vanilla && return 0
25
25
26
	epatch "${FILESDIR}"/gcc-4.1.0-delete-libart-check.patch
27
26
	# Fix cross-compiling
28
	# Fix cross-compiling
27
	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
29
	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-cross-compile.patch
28
30
29
-- gcc-4.2.4-r1.ebuild
31
++ gcc-4.2.4-r1.ebuild
Lines 16-18 Link Here
16
	ppc? ( >=${CATEGORY}/binutils-2.17 )
16
	ppc? ( >=${CATEGORY}/binutils-2.17 )
17
	ppc64? ( >=${CATEGORY}/binutils-2.17 )
17
	ppc64? ( >=${CATEGORY}/binutils-2.17 )
18
	>=${CATEGORY}/binutils-2.15.94"
18
	>=${CATEGORY}/binutils-2.15.94"
19
-- gcc-4.3.6-r1.ebuild
19
20
src_prepare() {
21
	toolchain_src_prepare
22
23
	use vanilla && return 0
24
25
	epatch "${FILESDIR}"/gcc-4.2.0-delete-libart-check.patch
26
}
27
++ gcc-4.3.6-r1.ebuild
Lines 35-39 Link Here
35
35
36
	use vanilla && return 0
36
	use vanilla && return 0
37
37
38
	epatch "${FILESDIR}"/gcc-4.3.2-delete-libart-check.patch
39
38
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
40
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
39
}
41
}
40
-- gcc-4.4.7.ebuild
42
++ gcc-4.4.7.ebuild
Lines 35-42 Link Here
35
35
36
src_prepare() {
36
src_prepare() {
37
	toolchain_src_prepare
37
	toolchain_src_prepare
38
38
	use vanilla && return 0
39
	use vanilla && return 0
39
40
41
	epatch "${FILESDIR}"/gcc-4.4.5-delete-libart-check.patch
42
40
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
43
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
41
44
42
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
43
-- gcc-4.5.1-r1.ebuild
46
++ gcc-4.5.1-r1.ebuild
Lines 38-43 Link Here
38
38
39
	use vanilla && return 0
39
	use vanilla && return 0
40
40
41
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
42
41
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
43
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
42
44
43
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
44
-- gcc-4.5.2.ebuild
46
++ gcc-4.5.2.ebuild
Lines 38-43 Link Here
38
38
39
	use vanilla && return 0
39
	use vanilla && return 0
40
40
41
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
42
41
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
43
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
42
44
43
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
44
-- gcc-4.5.3-r2.ebuild
46
++ gcc-4.5.3-r2.ebuild
Lines 38-43 Link Here
38
38
39
	use vanilla && return 0
39
	use vanilla && return 0
40
40
41
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
42
41
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
43
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
42
44
43
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
44
-- gcc-4.5.4.ebuild
46
++ gcc-4.5.4.ebuild
Lines 38-43 Link Here
38
38
39
	use vanilla && return 0
39
	use vanilla && return 0
40
40
41
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
42
41
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
43
	sed -i 's/use_fixproto=yes/:/' gcc/config.gcc #PR33200
42
44
43
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
44
-- gcc-4.6.0.ebuild
46
++ gcc-4.6.0.ebuild
Lines 42-46 Link Here
42
42
43
	use vanilla && return 0
43
	use vanilla && return 0
44
44
45
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
46
45
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
46
}
48
}
47
-- gcc-4.6.1-r1.ebuild
49
++ gcc-4.6.1-r1.ebuild
Lines 43-47 Link Here
43
43
44
	use vanilla && return 0
44
	use vanilla && return 0
45
45
46
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
47
46
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
48
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
47
}
49
}
48
-- gcc-4.6.2.ebuild
50
++ gcc-4.6.2.ebuild
Lines 46-50 Link Here
46
46
47
	use vanilla && return 0
47
	use vanilla && return 0
48
48
49
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
50
49
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
51
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
50
}
52
}
51
-- gcc-4.6.3.ebuild
53
++ gcc-4.6.3.ebuild
Lines 44-48 Link Here
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
46
47
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
48
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
49
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
48
}
50
}
49
-- gcc-4.6.4.ebuild
51
++ gcc-4.6.4.ebuild
Lines 44-48 Link Here
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
46
47
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
48
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
49
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
48
}
50
}
49
-- gcc-4.7.0.ebuild
51
++ gcc-4.7.0.ebuild
Lines 49-53 Link Here
49
49
50
	use vanilla && return 0
50
	use vanilla && return 0
51
51
52
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
53
52
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
54
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
53
}
55
}
54
-- gcc-4.7.1.ebuild
56
++ gcc-4.7.1.ebuild
Lines 49-53 Link Here
49
49
50
	use vanilla && return 0
50
	use vanilla && return 0
51
51
52
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
53
52
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
54
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
53
}
55
}
54
-- gcc-4.7.2-r1.ebuild
56
++ gcc-4.7.2-r1.ebuild
Lines 49-53 Link Here
49
49
50
	use vanilla && return 0
50
	use vanilla && return 0
51
51
52
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
53
52
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
54
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
53
}
55
}
54
-- gcc-4.7.3-r1.ebuild
56
++ gcc-4.7.3-r1.ebuild
Lines 49-53 Link Here
49
49
50
	use vanilla && return 0
50
	use vanilla && return 0
51
51
52
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
53
52
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
54
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
53
}
55
}
54
-- gcc-4.7.4.ebuild
56
++ gcc-4.7.4.ebuild
Lines 49-53 Link Here
49
49
50
	use vanilla && return 0
50
	use vanilla && return 0
51
51
52
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
53
52
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
54
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
53
}
55
}
54
-- gcc-4.8.0.ebuild
56
++ gcc-4.8.0.ebuild
Lines 44-48 Link Here
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
46
47
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
48
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
49
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
48
}
50
}
49
-- gcc-4.8.1-r1.ebuild
51
++ gcc-4.8.1-r1.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.5.0-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}
49
-- gcc-4.8.2.ebuild
52
++ gcc-4.8.2.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}
49
-- gcc-4.8.3.ebuild
52
++ gcc-4.8.3.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}
49
-- gcc-4.9.0.ebuild
52
++ gcc-4.9.0.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}
49
-- gcc-4.9.1.ebuild
52
++ gcc-4.9.1.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}
49
-- gcc-4.9.2.ebuild
52
++ gcc-4.9.2.ebuild
Lines 43-48 Link Here
43
	toolchain_src_prepare
43
	toolchain_src_prepare
44
44
45
	use vanilla && return 0
45
	use vanilla && return 0
46
47
	epatch "${FILESDIR}"/gcc-4.8.2-delete-libart-check.patch
48
46
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
49
	#Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
47
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
50
	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
48
}
51
}

Return to bug 513716