Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25723
Modified Files:
gcc48.patch
Log Message:
use configure fix submitted upstream for SDK move and restore libjava iconv fix
Index: gcc48.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/languages/gcc48.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gcc48.patch 31 May 2013 14:14:44 -0000 1.4
+++ gcc48.patch 5 Jul 2013 04:29:57 -0000 1.5
@@ -81,3 +81,72 @@
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }; then
cross_compiling=no
+diff -uNr gcc-4.8.1/configure gcc-4.8.1.fink/configure
+--- gcc-4.8.1/configure 2013-02-15 12:45:54.000000000 -0500
++++ gcc-4.8.1.fink/configure 2013-07-04 23:37:09.000000000 -0400
+@@ -7414,6 +7414,13 @@
+ target_configargs="--with-cross-host=${host_noncanonical}
${target_configargs}"
+ fi
+
++# Pass --with-sysroot on darwin without SDK in /
++case "${target}" in
++ x86_64-*-darwin1[3-9]*)
++ host_configargs="--with-sysroot=\"`xcrun --show-sdk-path`\"
${host_configargs}"
++ ;;
++esac
++
+ # Default to --enable-multilib.
+ if test x${enable_multilib} = x ; then
+ target_configargs="--enable-multilib ${target_configargs}"
+diff -uNr gcc-4.8.1/configure.ac gcc-4.8.1.fink/configure.ac
+--- gcc-4.8.1/configure.ac 2013-02-15 12:45:54.000000000 -0500
++++ gcc-4.8.1.fink/configure.ac 2013-07-04 23:37:08.000000000 -0400
+@@ -2848,6 +2848,13 @@
+ target_configargs="--with-cross-host=${host_noncanonical}
${target_configargs}"
+ fi
+
++# Pass --with-sysroot on darwin without SDK in /
++case "${target}" in
++ x86_64-*-darwin1[[3-9]]*)
++ host_configargs="--with-sysroot=\"`xcrun --show-sdk-path`\"
${host_configargs}"
++ ;;
++esac
++
+ # Default to --enable-multilib.
+ if test x${enable_multilib} = x ; then
+ target_configargs="--enable-multilib ${target_configargs}"
+diff -uNr gcc-4.8.1/libjava/Makefile.am gcc-4.8.1.fink/libjava/Makefile.am
+--- gcc-4.8.1/libjava/Makefile.am 2013-01-07 13:23:42.000000000 -0500
++++ gcc-4.8.1.fink/libjava/Makefile.am 2013-07-04 22:44:57.000000000 -0400
+@@ -492,7 +492,7 @@
+ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS)
$(extra_ldflags) $(THREADLIBS) \
+ $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
++ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL) $(LDLIBICONV)
+ libgcj_la_LIBADD = \
+ classpath/native/fdlibm/libfdlibm.la \
+ java/lang/Object.lo \
+diff -uNr gcc-4.8.1/libjava/Makefile.in gcc-4.8.1.fink/libjava/Makefile.in
+--- gcc-4.8.1/libjava/Makefile.in 2013-01-07 13:23:42.000000000 -0500
++++ gcc-4.8.1.fink/libjava/Makefile.in 2013-07-04 22:46:36.000000000 -0400
+@@ -1071,7 +1071,7 @@
+ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS)
$(extra_ldflags) $(THREADLIBS) \
+ $(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
+ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
+- $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
++ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL) $(LDLIBICONV)
+
+ libgcj_la_LIBADD = \
+ classpath/native/fdlibm/libfdlibm.la \
+diff -uNr gcc-4.8.1/libjava/libgcj.spec.in
gcc-4.8.1.fink/libjava/libgcj.spec.in
+--- gcc-4.8.1/libjava/libgcj.spec.in 2011-02-04 00:51:57.000000000 -0500
++++ gcc-4.8.1.fink/libjava/libgcj.spec.in 2013-07-04 22:36:57.000000000
-0400
+@@ -7,6 +7,6 @@
+ *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
+
+ %rename lib liborig
+-*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@
@LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@
%(libgcc) @LIBSTDCXXSPEC@ %(liborig)
++*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@
@LIBMATHSPEC@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc)
@LIBSTDCXXSPEC@ %(liborig)
+
+ *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@
@EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@
-fkeep-inline-functions
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
