diff options
| -rwxr-xr-x | 14.1/gcc/gcc-multilib.SlackBuild | 9 | ||||
| -rwxr-xr-x | current/gcc/gcc-multilib.SlackBuild | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/14.1/gcc/gcc-multilib.SlackBuild b/14.1/gcc/gcc-multilib.SlackBuild index 8d61240..59bd286 100755 --- a/14.1/gcc/gcc-multilib.SlackBuild +++ b/14.1/gcc/gcc-multilib.SlackBuild @@ -46,7 +46,7 @@ PKGNAM=gcc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} # How many jobs to run in parallel: NUMJOBS=" -j7 " @@ -151,6 +151,11 @@ cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cd $TMP tar xvf $CWD/gcc-$VERSION.tar.?z* +( cd gcc-$VERSION + # Restore target headers that were dropped (accidentally?) in gcc-4.8.0: + zcat $CWD/gcc.target_h.diff.gz | patch -p1 --verbose || 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 @@ -338,7 +343,7 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) 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 \) \ diff --git a/current/gcc/gcc-multilib.SlackBuild b/current/gcc/gcc-multilib.SlackBuild index 8d61240..59bd286 100755 --- a/current/gcc/gcc-multilib.SlackBuild +++ b/current/gcc/gcc-multilib.SlackBuild @@ -46,7 +46,7 @@ PKGNAM=gcc VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} # How many jobs to run in parallel: NUMJOBS=" -j7 " @@ -151,6 +151,11 @@ cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cd $TMP tar xvf $CWD/gcc-$VERSION.tar.?z* +( cd gcc-$VERSION + # Restore target headers that were dropped (accidentally?) in gcc-4.8.0: + zcat $CWD/gcc.target_h.diff.gz | patch -p1 --verbose || 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 @@ -338,7 +343,7 @@ ANTLJAR=$(echo $CWD/antlr-*.jar | tail -1) 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 \) \ |