diff options
Diffstat (limited to 'source/d/gcc')
-rw-r--r-- | source/d/gcc/gcc-4.7.1.adalib.pic.diff | 40 | ||||
-rwxr-xr-x | source/d/gcc/gcc.SlackBuild | 19 | ||||
-rw-r--r-- | source/d/gcc/slack-desc.gcc | 2 |
3 files changed, 11 insertions, 50 deletions
diff --git a/source/d/gcc/gcc-4.7.1.adalib.pic.diff b/source/d/gcc/gcc-4.7.1.adalib.pic.diff deleted file mode 100644 index 792ec654..00000000 --- a/source/d/gcc/gcc-4.7.1.adalib.pic.diff +++ /dev/null @@ -1,40 +0,0 @@ -From 176ff0f9a1016553978d6cf41770703e2ad90958 Mon Sep 17 00:00:00 2001 -From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Thu, 14 Jun 2012 17:45:53 +0000 -Subject: [PATCH 1/1] * gcc-interface/Makefile.in (gnatlib-shared-default): Append - $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188623 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/ada/ChangeLog | 5 +++++ - gcc/ada/gcc-interface/Makefile.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog -index 7e3195a..072a3f2 100644 ---- a/gcc/ada/ChangeLog -+++ b/gcc/ada/ChangeLog -@@ -1,3 +1,8 @@ -+2012-06-14 Jakub Jelinek <jakub@redhat.com> -+ -+ * gcc-interface/Makefile.in (gnatlib-shared-default): Append -+ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. -+ - 2012-06-14 Release Manager - - * GCC 4.7.1 released. -diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in -index ee8db38..f9e7eda 100644 ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -2597,7 +2597,7 @@ gnatlib-shared-default: - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \ -- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ -+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \ - MULTISUBDIR="$(MULTISUBDIR)" \ - THREAD_KIND="$(THREAD_KIND)" \ - gnatlib --- -1.7.3.4 diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index df5f99d5..cb96a231 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -2,7 +2,7 @@ # GCC package build script (written by volkerdi@slackware.com) # # Copyright 2003, 2004 Slackware Linux, Inc., Concord, California, USA -# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -137,6 +137,10 @@ cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cd $TMP tar xvf $CWD/gcc-$VERSION.tar.?z* +#( cd gcc-$VERSION +# If we had any patches, we would apply them here, but we're .diff free now. +#) || exit 1 + # Copy ecj.jar into the TLD of the source. Needed for java compiler. # This can be retrieved from ftp://sourceware.org/pub/java cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar @@ -146,11 +150,6 @@ cp $CWD/ecj-4.5.jar gcc-$VERSION/ecj.jar #https://oss.sonatype.org/content/repositories/releases/org/antlr/antlr-runtime/ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) -# Upstream -fPIC fix for gnat build: -cd gcc-$VERSION - zcat $CWD/gcc-4.7.1.adalib.pic.diff.gz | patch -p1 --verbose || exit 1 -cd .. - # install docs ( cd gcc-$VERSION # Smite the fixincludes: @@ -330,7 +329,7 @@ cd .. echo rm -rf fastjar-$FASTJARVER tar xvf $CWD/fastjar-$FASTJARVER.tar.xz || exit 1 - cd fastjar-$FASTJARVER || exit + cd fastjar-$FASTJARVER || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -615,6 +614,7 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin mv $PKG1/usr/bin/gij usr/bin mv $PKG1/usr/bin/gjar usr/bin mv $PKG1/usr/bin/gjarsigner usr/bin + mv $PKG1/usr/bin/gjdoc usr/bin mv $PKG1/usr/bin/gkeytool usr/bin mv $PKG1/usr/bin/grepjar usr/bin mv $PKG1/usr/bin/grmid usr/bin @@ -709,7 +709,8 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin # statically, and we'll need a newer one elsewhere. find . -name "ffi*.h" | xargs rm find . -name "libffi*" | xargs rm - rm usr/man/man3/ffi* + rm -f usr/man/man3/ffi* + rm -f usr/info/libffi* ) # gcc-objc: @@ -740,7 +741,7 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin mv $PKG1/usr/info/gccgo.info.gz usr/info mkdir -p usr/lib${LIBDIRSUFFIX} mv $PKG1/usr/lib${LIBDIRSUFFIX}/go usr/lib${LIBDIRSUFFIX} - mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so.0.*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1 + mv $PKG1/usr/lib${LIBDIRSUFFIX}/{libgo.la,libgo.so*,libgobegin.a} usr/lib${LIBDIRSUFFIX} || exit 1 # Ordinarily Slackware doesn't package static libraries, but in this case # it is useful for deploying compiled binaries on machines that do not yet # have libgo.so.0.0.0. diff --git a/source/d/gcc/slack-desc.gcc b/source/d/gcc/slack-desc.gcc index 04fccd4d..1f842675 100644 --- a/source/d/gcc/slack-desc.gcc +++ b/source/d/gcc/slack-desc.gcc @@ -11,7 +11,7 @@ gcc: gcc: GCC is the GNU Compiler Collection. gcc: gcc: This package contains those parts of the compiler collection needed to -gcc: compile C code. Other packages add C++, Fortran, Objective-C, and +gcc: compile C code. Other packages add C++, Fortran, Go, Objective-C, and gcc: Java support to the compiler core. gcc: gcc: |