diff options
author | Eric Hameleers <alien@slackware.com> | 2010-06-01 17:15:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2010-06-01 17:15:29 +0000 |
commit | 96041590931b7ed0d9bba7e2bf8f362be1d5c8d6 (patch) | |
tree | 255e43aaa13f48e1a4010cf23c6f3488a40bc124 /webkitgtk/build/webkitgtk.SlackBuild | |
parent | d6ac316135312eb681c1f9f2c0cfec34a8cf8d7b (diff) | |
download | asb-96041590931b7ed0d9bba7e2bf8f362be1d5c8d6.tar.gz asb-96041590931b7ed0d9bba7e2bf8f362be1d5c8d6.tar.xz |
Updated to 1.2.1
Diffstat (limited to '')
-rwxr-xr-x | webkitgtk/build/webkitgtk.SlackBuild | 64 |
1 files changed, 34 insertions, 30 deletions
diff --git a/webkitgtk/build/webkitgtk.SlackBuild b/webkitgtk/build/webkitgtk.SlackBuild index 23255230..8702a55e 100755 --- a/webkitgtk/build/webkitgtk.SlackBuild +++ b/webkitgtk/build/webkitgtk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright (c) 2009 Eric Hameleers, Eindhoven, NL +# Copyright (c) 2009,2010 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -34,6 +34,8 @@ # * Initial build. # 1.1.12-1: 20/sep/2009 by Eric Hameleers <alien@slackware.com> # * Update. +# 1.2.1-1: 01/jun/2010 by Eric Hameleers <alien@slackware.com> +# * Update. # # Run 'sh webkitgtk.SlackBuild' to build a Slackware package. # The package (.tgz) and .txt file as well as build logs are created in /tmp . @@ -45,8 +47,7 @@ PRGNAM=webkitgtk SRCNAM=webkit -VERSION=${VERSION:-1.1.12} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-1.2.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} TAG=${TAG:-alien} @@ -73,28 +74,39 @@ SRCURL="http://www.webkitgtk.org/webkit-${VERSION}.tar.gz" ## --- with a little luck, you won't have to edit below this point --- ## ## -# Exit the script on errors: -set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR -# Catch unitialized variables: -set -u -P1=${1:-1} +# 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 case "$ARCH" in i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; - s390) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - powerpc) SLKCFLAGS="-O2" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; + *) SLKCFLAGS="-O2" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; esac +# Exit the script on errors: +set -e +trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR +# Catch unitialized variables: +set -u +P1=${1:-1} + +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + # Create working directories: mkdir -p $OUTPUT # place for the package to be saved mkdir -p $TMP/tmp-$PRGNAM # location to build the source @@ -139,7 +151,7 @@ echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} cd ${SRCNAM}-${VERSION} chown -R root:root . -chmod -R u+w,go+r-w,a-s . +chmod -R u+w,go+r-w,a-X-s . echo Building ... LDFLAGS="$SLKLDFLAGS" \ @@ -155,25 +167,14 @@ CFLAGS="$SLKCFLAGS" \ --program-suffix= \ --build=$ARCH-slackware-linux \ 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log -make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -# Install all the needed stuff to the package dir -# Use installwatch if available, to produce a logfile of the installation -# process that is more easily readable: -if $(which installwatch > /dev/null 2>&1); then - installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install -else - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log -fi +make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log +make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a --parents $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true -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 find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -208,3 +209,6 @@ if [ -f $PKG/install/slack-required ]; then cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep fi +# Restore the original umask: +umask ${_UMASK_} + |