summaryrefslogtreecommitdiff
path: root/source/a/bzip2
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/bzip2')
-rw-r--r--source/a/bzip2/bzip2-1.0.4.saneso.diff20
-rwxr-xr-xsource/a/bzip2/bzip2.SlackBuild28
-rw-r--r--source/a/bzip2/bzip2.saneso.diff20
3 files changed, 39 insertions, 29 deletions
diff --git a/source/a/bzip2/bzip2-1.0.4.saneso.diff b/source/a/bzip2/bzip2-1.0.4.saneso.diff
deleted file mode 100644
index edbf1ad0..00000000
--- a/source/a/bzip2/bzip2-1.0.4.saneso.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Makefile-libbz2_so.orig 2007-01-02 20:00:55.000000000 -0600
-+++ ./Makefile-libbz2_so 2007-01-23 22:02:29.000000000 -0600
-@@ -35,13 +35,13 @@
- bzlib.o
-
- all: $(OBJS)
-- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
-+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS)
- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
-- rm -f libbz2.so.1.0
-- ln -s libbz2.so.1.0.4 libbz2.so.1.0
-+ rm -f libbz2.so.1
-+ ln -s libbz2.so.1.0.4 libbz2.so.1
-
- clean:
-- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
-+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1 bzip2-shared
-
- blocksort.o: blocksort.c
- $(CC) $(CFLAGS) -c blocksort.c
diff --git a/source/a/bzip2/bzip2.SlackBuild b/source/a/bzip2/bzip2.SlackBuild
index 465f75e0..46b1b1ef 100755
--- a/source/a/bzip2/bzip2.SlackBuild
+++ b/source/a/bzip2/bzip2.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,11 +20,21 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-VERSION=1.0.5
-SOLIB=1.0.4
-ARCH=${ARCH:-x86_64}
+PKGNAM=bzip2
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+SOLIB=1.0.6
BUILD=${BUILD:-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
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-bzip2
@@ -40,13 +50,13 @@ mkdir -p $TMP $PKG
cd $TMP
rm -rf bzip2-$VERSION
-tar xzvf $CWD/bzip2-$VERSION.tar.gz
-cd bzip2-$VERSION
+tar xzvf $CWD/bzip2-$VERSION.tar.gz || exit 1
+cd bzip2-$VERSION || exit 1
chown -R root:root .
# This should be ok, since libbz2.so.1.0 will still exist.
-zcat $CWD/bzip2-1.0.4.saneso.diff.gz | patch -p1 || exit
+zcat $CWD/bzip2.saneso.diff.gz | patch -p1 || exit
make -f Makefile-libbz2_so || exit 1
-make || exit 1
+make -j3 || make || exit 1
mkdir -p $PKG/usr/include
cp -a bzlib.h $PKG/usr/include
chown root:root $PKG/usr/include/bzlib.h
@@ -64,7 +74,7 @@ mkdir -p $PKG/usr/man/man1
cat bzip2.1 | gzip -9c > $PKG/usr/man/man1/bzip2.1.gz
echo '.so man1/bzip2.1' | gzip -9c > $PKG/usr/man/man1/bzip2recover.1.gz
mkdir -p $PKG/usr/doc/bzip2-$VERSION
-cp -a CHANGES LICENSE README README.COMPILATION.PROBLEMS Y2K_INFO \
+cp -a CHANGES LICENSE README* \
bzip2.txt *.html $PKG/usr/doc/bzip2-$VERSION
chmod 644 $PKG/usr/doc/bzip2-$VERSION/*
# Link up them links
diff --git a/source/a/bzip2/bzip2.saneso.diff b/source/a/bzip2/bzip2.saneso.diff
new file mode 100644
index 00000000..4f0acc6e
--- /dev/null
+++ b/source/a/bzip2/bzip2.saneso.diff
@@ -0,0 +1,20 @@
+--- ./Makefile-libbz2_so.orig 2010-09-10 18:07:52.000000000 -0500
++++ ./Makefile-libbz2_so 2010-09-20 12:30:10.475525363 -0500
+@@ -35,13 +35,13 @@
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+- rm -f libbz2.so.1.0
+- ln -s libbz2.so.1.0.6 libbz2.so.1.0
++ rm -f libbz2.so.1
++ ln -s libbz2.so.1.0.6 libbz2.so.1
+
+ clean:
+- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1 bzip2-shared
+
+ blocksort.o: blocksort.c
+ $(CC) $(CFLAGS) -c blocksort.c