diff options
author | Eric Hameleers <alien@slackware.com> | 2010-04-07 10:48:43 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2010-04-07 10:48:43 +0000 |
commit | 408db35739d101dd291bc72613132146787a9034 (patch) | |
tree | cc77a8e7d0ac99e3f6eb11d9603dab989f3e4dcb | |
parent | 622756c0bf0dda831cb925641f8d021decb4ea49 (diff) | |
download | asb-408db35739d101dd291bc72613132146787a9034.tar.gz asb-408db35739d101dd291bc72613132146787a9034.tar.xz |
Fix ownership/permissions of include files
-rwxr-xr-x | mozilla-nss/build/mozilla-nss.SlackBuild | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/mozilla-nss/build/mozilla-nss.SlackBuild b/mozilla-nss/build/mozilla-nss.SlackBuild index 790fe3fa..bd91a679 100755 --- a/mozilla-nss/build/mozilla-nss.SlackBuild +++ b/mozilla-nss/build/mozilla-nss.SlackBuild @@ -38,8 +38,10 @@ # * Update to NSS 3.11.4 with NSPR 4.6.4 # 3.11.4-2: 28/dec/2008 by Eric Hameleers <alien@slackware.com> # * Make it build on x86_64 (patch by '414N'). -# 3.12.3-2: 17/jul/2009 by Eric Hameleers <alien@slackware.com> +# 3.12.3-1: 17/jul/2009 by Eric Hameleers <alien@slackware.com> # * Update +# 3.12.3-2: 07/apr/2010 by Eric Hameleers <alien@slackware.com> +# * Fix some file ownerships in the package. # # Run 'sh mozilla-nss.SlackBuild' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -52,8 +54,7 @@ SRCNAM=nss VERSION=${VERSION:-3.12.3} NSPR=${NSPR:-4.7.4} UCDIR=$(echo ${SRCNAM}.${VERSION} | tr '.a-z' '_A-Z') -ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-alien} # Where do we look for sources? @@ -75,21 +76,25 @@ SRCURL[0]="http://ftp.mozilla.org/pub/mozilla.org/security/${SRCNAM}/releases/${ SOURCE[1]="$SRCDIR/nspr-${NSPR}.tar.gz" SRCURL[1]="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${NSPR}/src/nspr-${NSPR}.tar.bz2" +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" export USE_64=1 -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" +else + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -156,7 +161,8 @@ mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include/{nss,nspr}} cd mozilla/dist/$(uname -s)* cp -pL bin/* $PKG/usr/bin/ cp -pL lib/* $PKG/usr/lib${LIBDIRSUFFIX}/ - cp -rpL include/* $PKG/usr/include/nspr/ + chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/* + cp -rL include/* $PKG/usr/include/nspr/ cp -rpL ../public/nss/*.h $PKG/usr/include/nss/ rm -f $PKG/usr/bin/*.so rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a @@ -206,11 +212,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ $SRCDIR/MPL-1.1.txt $SRCDIR/gpl-2.0.txt $SRCDIR/lgpl-2.1.txt $SRCDIR/faq.html \ $PKG/usr/doc/$PRGNAM-$VERSION -cat $SRCDIR/$(basename $0) | sed \ - -e "/^VERSION=/s/:-.*}/:-$VERSION}/" \ - -e "/^ARCH=/s/:-.*}/:-$ARCH}/" \ - -e "/^BUILD=/s/:-.*}/:-$BUILD}/" \ - > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION # Strip binaries: |