git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure, [...]: Rebuilt. 

* configure, Makefile.in: Rebuilt.
	* configure.ac (JAR): Check for -@ feature.
	* Makefile.am (libgcj-$(gcc_version).jar): Use find -prune.

From-SVN: r121429
This commit is contained in:
Tom Tromey 2007-01-31 17:38:55 +00:00 committed by Tom Tromey
parent d1fc69e4a5
commit a968c71490
5 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2007-01-31 Tom Tromey <tromey@redhat.com>
* configure, Makefile.in: Rebuilt.
* configure.ac (JAR): Check for -@ feature.
* Makefile.am (libgcj-$(gcc_version).jar): Use find -prune.
2007-01-31 Tom Tromey <tromey@redhat.com> 2007-01-31 Tom Tromey <tromey@redhat.com>
PR libgcj/30606: PR libgcj/30606:

3
libjava/Makefile.am
View File

@ -333,8 +333,7 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes
## Note that this now omits the property files. ## Note that this now omits the property files.
## It doesn't matter since we don't use the jar at runtime. ## It doesn't matter since we don't use the jar at runtime.
here=`pwd`; cd $(srcdir)/classpath/lib; \ here=`pwd`; cd $(srcdir)/classpath/lib; \
find gnu java javax org sun -name '*.class' -print | \ find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \
fgrep -v .svn | \
$(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip

3
libjava/Makefile.in
View File

@ -9902,8 +9902,7 @@ $(propertyo_files): %.lo: classpath/resource/%
libgcj-$(gcc_version).jar: classpath/lib/compile-classes libgcj-$(gcc_version).jar: classpath/lib/compile-classes
here=`pwd`; cd $(srcdir)/classpath/lib; \ here=`pwd`; cd $(srcdir)/classpath/lib; \
find gnu java javax org sun -name '*.class' -print | \ find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \
fgrep -v .svn | \
$(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar
libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip

16
libjava/configure vendored
View File

@ -4198,6 +4198,18 @@ else
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
fi fi
# We need a jar that supports -@. This is a GNU extension.
if test "$JAR" != no; then
rm -f config-test.jar
echo $srcdir/configure.ac | $JAR -cf@ config-test.jar
if test -f config-test.jar; then
rm -f config-test.jar
else
JAR=no
fi
fi
# Prefer the jar we found, but fall back to our jar script. # Prefer the jar we found, but fall back to our jar script.
if test "$JAR" = no; then if test "$JAR" = no; then
if test "$ZIP" = no; then if test "$ZIP" = no; then
@ -6012,7 +6024,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic"
case $host in case $host in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 6015 "configure"' > conftest.$ac_ext echo '#line 6027 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5 (eval $ac_compile) 2>&5
ac_status=$? ac_status=$?
@ -7054,7 +7066,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then
: :
else else
cat > conftest.$ac_ext << EOF cat > conftest.$ac_ext << EOF
#line 7057 "configure" #line 7069 "configure"
struct S { ~S(); }; struct S { ~S(); };
void bar(); void bar();
void foo() void foo()

12
libjava/configure.ac
View File

@ -117,6 +117,18 @@ AC_PROG_AWK
AC_CHECK_PROGS([JAR], [jar fastjar gjar], no) AC_CHECK_PROGS([JAR], [jar fastjar gjar], no)
AC_PATH_PROG([ZIP], [zip], no) AC_PATH_PROG([ZIP], [zip], no)
AC_PATH_PROG([UNZIP], [unzip], unzip) AC_PATH_PROG([UNZIP], [unzip], unzip)
# We need a jar that supports -@. This is a GNU extension.
if test "$JAR" != no; then
rm -f config-test.jar
echo $srcdir/configure.ac | $JAR -cf@ config-test.jar
if test -f config-test.jar; then
rm -f config-test.jar
else
JAR=no
fi
fi
# Prefer the jar we found, but fall back to our jar script. # Prefer the jar we found, but fall back to our jar script.
if test "$JAR" = no; then if test "$JAR" = no; then
if test "$ZIP" = no; then if test "$ZIP" = no; then