diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-01-01 21:50:30 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-01-01 21:50:30 +0000 |
| commit | e1e5816be233b7ab78eec47187e2b5a657ecc458 (patch) | |
| tree | 9b3414e6746eb5dacc367a9fe773fff30d177ab4 /13.37 | |
| parent | 8687095a95bd6a00269da1844f1694fe802da619 (diff) | |
| download | multilib-e1e5816be233b7ab78eec47187e2b5a657ecc458.tar.gz multilib-e1e5816be233b7ab78eec47187e2b5a657ecc458.tar.xz | |
Updated for Slackware 13.1 and gcc-4.4.2
Diffstat (limited to '13.37')
| -rwxr-xr-x | 13.37/gcc/gcc-multilib.SlackBuild | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/13.37/gcc/gcc-multilib.SlackBuild b/13.37/gcc/gcc-multilib.SlackBuild index aeb2286..87662d7 100755 --- a/13.37/gcc/gcc-multilib.SlackBuild +++ b/13.37/gcc/gcc-multilib.SlackBuild @@ -42,10 +42,10 @@ # I see no reason to continue 386 support in the latest Slackware (and indeed # it's no longer easily possible). -VERSION=4.3.3 +VERSION=4.4.2 ARCH=${ARCH:-x86_64} TARGET=$ARCH-slackware-linux -BUILD=${BUILD:-4alien} +BUILD=${BUILD:-1alien} # How many jobs to run in parallel: NUMJOB=" -j 4 " @@ -266,6 +266,7 @@ cp $CWD/ecj-4.3.jar gcc-$VERSION/ecj.jar --enable-threads=posix \ --enable-checking=release \ --with-system-zlib \ + --with-python-dir=/lib$LIBDIRSUFFIX/python2.6/site-packages \ --disable-libunwind-exceptions \ --enable-__cxa_atexit \ --enable-libssp \ @@ -443,6 +444,7 @@ fi # gcc-java: ( cd $PKG5 mkdir -p usr/bin + mv $PKG1/usr/bin/aot-compile usr/bin mv $PKG1/usr/bin/addr2name.awk usr/bin # mv $PKG1/usr/bin/fastjar usr/bin mv $PKG1/usr/bin/gappletviewer usr/bin @@ -464,7 +466,9 @@ fi mv $PKG1/usr/bin/jcf-dump usr/bin mv $PKG1/usr/bin/jv-* usr/bin mv $PKG1/usr/bin/rmi* usr/bin - mkdir -p usr/include + mkdir -p usr/include/c++/$VERSION + # Move some Java only C++ headers from the C++ package: + mv $PKG2/usr/include/c++/$VERSION/{gcj,gnu,java,javax,org,sun} usr/include/c++/$VERSION mv $PKG1/usr/include/ffi.h usr/include mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jawt.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include @@ -475,6 +479,12 @@ fi mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/jni_md.h usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include 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 !" + exit 1 + fi + mv $PKG1/usr/lib${LIBDIRSUFFIX}/python2.6 usr/lib${LIBDIRSUFFIX} mkdir -p usr/info mv $PKG1/usr/info/gcj.* usr/info # mv $PKG1/usr/info/fastjar.* usr/info @@ -506,6 +516,7 @@ fi mkdir -p usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mv $PKG1/usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include/gcj usr/lib${LIBDIRSUFFIX}/gcc/$TARGET/$VERSION/include mkdir -p usr/man/man1 + mv $PKG1/usr/man/man1/aot-compile.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gappletviewer.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gc-analyze.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gcj.1.gz usr/man/man1 @@ -515,6 +526,7 @@ fi mv $PKG1/usr/man/man1/gjar.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjarsigner.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjavah.1.gz usr/man/man1 + mv $PKG1/usr/man/man1/gjdoc.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gjnih.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gkeytool.1.gz usr/man/man1 mv $PKG1/usr/man/man1/gnative2ascii.1.gz usr/man/man1 @@ -527,6 +539,7 @@ fi mv $PKG1/usr/man/man1/jcf-dump.1.gz usr/man/man1 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/share mv $PKG1/usr/share/java usr/share ) |