Solaris/dbpware-for-solaris
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bzip2: update to 1.0.6

Browse Source
This commit is contained in:
Tom G. Christensen 2013-11-20 17:19:39 +01:00
parent 9f828ed6bc
commit 6d90837991
4 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bzip2/build.sh
View File

@ -6,26 +6,31 @@
########################################################### ###########################################################
# Check the following 4 variables before running the script # Check the following 4 variables before running the script
topdir=bzip2 topdir=bzip2
version=1.0.5 version=1.0.6
pkgver=1 pkgver=1
source[0]=$topdir-$version.tar.gz source[0]=http://bzip.org/${version}/$topdir-$version.tar.gz
# If there are no patches, simply comment this # If there are no patches, simply comment this
patch[0]=bzip2-1.0.5-saneso.patch patch[0]=bzip2-1.0.6-sane_soname.patch
# Source function library # Source function library
. ${BUILDPKG_SCRIPTS}/buildpkg.functions . ${BUILDPKG_SCRIPTS}/buildpkg.functions
# Global settings
shortroot=1
reg prep reg prep
prep() prep()
{ {
generic_prep generic_prep
# Solaris ld needs -h instead of -soname
${__gsed} -i 's/-soname/-h/g' Makefile-libbz2_so
} }
reg build reg build
build() build()
{ {
setdir source setdir source
${__make} -f Makefile-libbz2_so CC="gcc -R$prefix/lib" CFLAGS="-D_FILE_OFFSET_BITS=64 -fpic -fPIC" ${__make} -f Makefile-libbz2_so CC="gcc -R$prefix/lib"
rm -f *.o rm -f *.o
${__make} -f Makefile LDFLAGS="-R$prefix/lib" ${__make} -f Makefile LDFLAGS="-R$prefix/lib"
} }
@ -39,29 +44,29 @@ check()
reg install reg install
install() install()
{ {
clean stage generic_install PREFIX
setdir source setdir source
${__mkdir} -p ${stagedir}${prefix}/{${_bindir},${_mandir}/man1,${_libdir},${_includedir}} # Install shared library
${__install} -m 755 bzlib.h ${stagedir}${prefix}/${_includedir} ${__install} -m 755 libbz2.so.${version} ${stagedir}${prefix}/${_libdir}
${__install} -m 755 libbz2.so.1.0.4 ${stagedir}${prefix}/${_libdir} ${__ln} -s libbz2.so.${version} ${stagedir}${prefix}/${_libdir}/libbz2.so.1
${__install} -m 755 libbz2.a ${stagedir}${prefix}/${_libdir} ${__ln} -s libbz2.so.1 ${stagedir}${prefix}/${_libdir}/libbz2.so
# Install dynamically linked bzip2 binary
${__install} -m 755 bzip2-shared ${stagedir}${prefix}/${_bindir}/bzip2 ${__install} -m 755 bzip2-shared ${stagedir}${prefix}/${_bindir}/bzip2
${__install} -m 755 bzip2recover bzgrep bzdiff bzmore ${stagedir}${prefix}/${_bindir}/ ${__rm} -f ${stagedir}${prefix}/${_bindir}/b{unzip2,zcat}
${__install} -m 644 bzip2.1 bzdiff.1 bzgrep.1 bzmore.1 ${stagedir}${prefix}/${_mandir}/man1/
${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bunzip2 ${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bunzip2
${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bzcat ${__ln} -s bzip2 ${stagedir}${prefix}/${_bindir}/bzcat
${__ln} -s bzdiff ${stagedir}${prefix}/${_bindir}/bzcmp
${__ln} -s bzmore ${stagedir}${prefix}/${_bindir}/bzless custom_install=1
${__ln} -s libbz2.so.1.0.4 ${stagedir}${prefix}/${_libdir}/libbz2.so.1 generic_install PREFIX
${__ln} -s libbz2.so.1 ${stagedir}${prefix}/${_libdir}/libbz2.so
${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bzip2recover.1
${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bunzip2.1
${__ln} -s bzip2.1 ${stagedir}${prefix}/${_mandir}/man1/bzcat.1
${__ln} -s bzdiff.1 ${stagedir}${prefix}/${_mandir}/man1/bzcmp.1
${__ln} -s bzmore.1 ${stagedir}${prefix}/${_mandir}/man1/bzless.1
doc LICENSE CHANGES README README.COMPILATION.PROBLEMS doc LICENSE CHANGES README README.COMPILATION.PROBLEMS
docs_for bzip2-devel manual.html docs_for bzip2-devel manual.html
${__mv} ${stagedir}${prefix}/man ${stagedir}${prefix}/share
compat bzip2 1.0.5 1 1
} }
reg pack reg pack

4
bzip2/meta/ChangeLog Normal file
View File

@ -0,0 +1,4 @@
CHANGELOG
---------
* Wed Nov 20 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 1.0.6-1
- Update to 1.0.6

19
bzip2/src/bzip2-1.0.5-saneso.patch
View File

@ -1,19 +0,0 @@
*** bzip2-1.0.5/Makefile-libbz2_so.orig Sat Apr 26 11:42:11 2008
--- bzip2-1.0.5/Makefile-libbz2_so Sat Apr 26 11:45:11 2008
***************
*** 35,41 ****
bzlib.o
all: $(OBJS)
! $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -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
--- 35,41 ----
bzlib.o
all: $(OBJS)
! $(CC) -shared -Wl,-h -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

21
bzip2/src/bzip2-1.0.6-sane_soname.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up bzip2-1.0.6/Makefile-libbz2_so.orig bzip2-1.0.6/Makefile-libbz2_so
--- bzip2-1.0.6/Makefile-libbz2_so.orig 2012-05-20 14:59:29.220018000 +0200
+++ bzip2-1.0.6/Makefile-libbz2_so 2012-05-20 15:01:03.570001000 +0200
@@ -35,13 +35,13 @@ OBJS= blocksort.o \
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