diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-06-20 07:59:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-06-20 07:59:37 +0000 |
| commit | 81bc7947e25b9f7257561818cde16c79c923e5c4 (patch) | |
| tree | 9b98590ef2aaa2119f2c430d21a7590bb534a046 /14.1 | |
| parent | b0afc0f5c24854e54bebd0de7e981015b43cd497 (diff) | |
| download | multilib-81bc7947e25b9f7257561818cde16c79c923e5c4.tar.gz multilib-81bc7947e25b9f7257561818cde16c79c923e5c4.tar.xz | |
Update to gcc 4.7.1
Diffstat (limited to '14.1')
| -rwxr-xr-x | 14.1/gcc/gcc-multilib.SlackBuild | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/14.1/gcc/gcc-multilib.SlackBuild b/14.1/gcc/gcc-multilib.SlackBuild index ad3d999..7238b17 100755 --- a/14.1/gcc/gcc-multilib.SlackBuild +++ b/14.1/gcc/gcc-multilib.SlackBuild @@ -160,6 +160,11 @@ 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: @@ -437,7 +442,7 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) --enable-checking=release \ --enable-objc-gc \ --with-system-zlib \ - --with-python-dir=/lib$LIBDIRSUFFIX/python2.6/site-packages \ + --with-python-dir=/lib$LIBDIRSUFFIX/python2.7/site-packages \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --enable-libssp \ @@ -688,11 +693,11 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jvmpi.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/libffi usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include # aot-compile Python plugins: - if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 ]; then - echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 !" + if [ ! -d $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 ]; then + echo "NO $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 !" exit 1 fi - mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 usr/lib${LIBDIRSUFFIX} + mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.7 usr/lib${LIBDIRSUFFIX} mkdir -p usr/info mv $PKG1/usr/info/gcj.* usr/info # mv $PKG1/usr/info/fastjar.* usr/info @@ -748,6 +753,8 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin mv $PKG1/usr/man/man1/jv-convert.1.gz usr/man/man1 mv $PKG1/usr/man/man1/jv-scan.1.gz usr/man/man1 mv $PKG1/usr/man/man1/rebuild-gcj-db.1.gz usr/man/man1 + mkdir -p usr/man/man3 + mv $PKG1/usr/man/man3/ffi* usr/man/man3 mkdir -p usr/share mv $PKG1/usr/share/java usr/share # The ecj wrapper script: @@ -759,6 +766,11 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin mv $PKG1/usr/lib$LIBDIRSUFFIX/jvm* usr/lib$LIBDIRSUFFIX # And add the missing javac symlink: ln -s ../../../bin/ecj usr/lib$LIBDIRSUFFIX/jvm/bin/javac + # Don't package libffi stuff anymore. GCC will link the internal version + # 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* ) # gcc-objc: @@ -798,14 +810,12 @@ mv $PKG1/usr/bin/gnative2ascii $PKG5/usr/bin # it is useful for deploying compiled binaries on machines that do not yet # have libgo.so.0.0.0. mv $PKG1/usr/lib${LIBDIRSUFFIX}/libgo.a usr/lib${LIBDIRSUFFIX} - if [ "$ARCH" = "x86_64" ]; then + if [ "$ARCH" = "x86_64" ]; then mkdir -p usr/lib mv $PKG1/usr/lib/go usr/lib mv $PKG1/usr/lib/{libgo.la,libgo.so.0.*,libgobegin.a} usr/lib || exit 1 mv $PKG1/usr/lib/libgo.a usr/lib fi - mkdir -p usr/libexec/gcc/$TARGET/$VERSION - mv $PKG1/usr/libexec/gcc/$TARGET/$VERSION/go usr/libexec/gcc/$TARGET/$VERSION/go mkdir -p usr/man/man1 mv $PKG1/usr/man/man1/gccgo.1.gz usr/man/man1 ) || exit 1 |