diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-04-15 18:59:14 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-04-15 18:59:14 +0000 |
| commit | 1c4fc138f5e94f99c7734ce0025bbabd4d982b8f (patch) | |
| tree | 47f17825615380ce124585e1a2062df77b6e6001 | |
| parent | 177f80c6aa2dc897529bf38423d534e095d1bee5 (diff) | |
| download | multilib-1c4fc138f5e94f99c7734ce0025bbabd4d982b8f.tar.gz multilib-1c4fc138f5e94f99c7734ce0025bbabd4d982b8f.tar.xz | |
gcc-multilib: bit of polishing
| -rwxr-xr-x | source/current/gcc/gcc-multilib.SlackBuild | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/current/gcc/gcc-multilib.SlackBuild b/source/current/gcc/gcc-multilib.SlackBuild index 782b792..5d09454 100755 --- a/source/current/gcc/gcc-multilib.SlackBuild +++ b/source/current/gcc/gcc-multilib.SlackBuild @@ -143,9 +143,9 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -# Temporary build location. This should *NOT* be a directory -# path a non-root user could create later... -TMP=${TMP:-"/gcc-$(mcookie)"} +# Temporary build location. It is OK to use /tmp now, +# since all gcc ELF objects have been scrubbed of rpaths. +TMP=${TMP:-/tmp} # This is the main DESTDIR target: PKG1=$TMP/package-gcc @@ -159,9 +159,7 @@ PKG8=$TMP/package-gcc-go PKG9=$TMP/package-gcc-brig # Clear the build locations: -if [ -d $TMP ]; then - rm -rf $TMP -fi +rm -rf $PKG{1,2,3,4,6,8,9} mkdir -p $PKG{1,2,3,4,6,8,9}/usr/doc/gcc-$VERSION # Insert package descriptions: @@ -176,10 +174,11 @@ cat $CWD/slack-desc.gcc-go > $PKG8/install/slack-desc cat $CWD/slack-desc.gcc-brig > $PKG9/install/slack-desc cd $TMP +rm -rf gcc-$VERSION tar xvf $CWD/gcc-$VERSION.tar.xz || exit 1 -# install docs ( cd gcc-$VERSION || exit 1 + # Smite the fixincludes: zcat $CWD/gcc-no_fixincludes.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 |