jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bzip2: enable large files support, change install dirs (from Arch).

Browse source
This commit is contained in:
Juan RP 2011-02-19 23:21:03 +01:00
parent 04264bd34a
commit 5317bf60bc
3 changed files with 41 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/bzip2/bzip2-devel.template
View file

@ -5,6 +5,8 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
revision=1
Add_dependency run glibc-devel
Add_dependency run bzip2

69
srcpkgs/bzip2/patches/Makefile_fix_install.diff
View file

@ -1,69 +0,0 @@
--- Makefile.orig 2008-02-14 13:39:18.000000000 +0100
+++ Makefile 2009-02-18 02:31:13.000000000 +0100
@@ -25,7 +25,7 @@ CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
PREFIX=/usr/local
-
+MANDIR=$(PREFIX)/share/man
OBJS= blocksort.o \
huffman.o \
@@ -72,8 +72,8 @@ test: bzip2
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
- if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
- if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
+ if ( test ! -d $(MANDIR) ) ; then mkdir -p $(MANDIR) ; fi
+ if ( test ! -d $(MANDIR)/man1 ) ; then mkdir -p $(MANDIR)/man1 ; fi
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
@@ -83,31 +83,30 @@ install: bzip2 bzip2recover
chmod a+x $(PREFIX)/bin/bunzip2
chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
- cp -f bzip2.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzip2.1
+ cp -f bzip2.1 $(MANDIR)/man1
+ chmod a+r $(MANDIR)/man1/bzip2.1
cp -f bzlib.h $(PREFIX)/include
chmod a+r $(PREFIX)/include/bzlib.h
cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
+ cp -a libbz2.so* $(PREFIX)/lib
+ #chmod a+r $(PREFIX)/lib/libbz2.*
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+ cd $(PREFIX)/bin && ln -s bzgrep bzegrep && ln -s bzgrep bzfgrep
chmod a+x $(PREFIX)/bin/bzgrep
cp -f bzmore $(PREFIX)/bin/bzmore
- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+ cd $(PREFIX)/bin && ln -s bzmore bzless
chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+ cd $(PREFIX)/bin && ln -s bzdiff bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
- chmod a+r $(PREFIX)/man/man1/bzmore.1
- chmod a+r $(PREFIX)/man/man1/bzdiff.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
- echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
- echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
- echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
-
+ cp -f bzgrep.1 bzmore.1 bzdiff.1 $(MANDIR)/man1
+ chmod a+r $(MANDIR)/man1/bzgrep.1
+ chmod a+r $(MANDIR)/man1/bzmore.1
+ chmod a+r $(MANDIR)/man1/bzdiff.1
+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzegrep.1
+ echo ".so man1/bzgrep.1" > $(MANDIR)/man1/bzfgrep.1
+ echo ".so man1/bzmore.1" > $(MANDIR)/man1/bzless.1
+ echo ".so man1/bzdiff.1" > $(MANDIR)/man1/bzcmp.1
clean:
rm -f *.o libbz2.a bzip2 bzip2recover \
sample1.rb2 sample2.rb2 sample3.rb2 \

48
srcpkgs/bzip2/template
View file

@ -1,10 +1,9 @@
# Template build file for 'bzip2'.
pkgname=bzip2
version=1.0.6
revision=1
distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz"
build_style=gnu_makefile
make_build_target="-f Makefile-libbz2_so"
make_install_args="PREFIX=$XBPS_DESTDIR/$pkgname-$version/usr"
build_style=custom-install
short_desc="The bzip2 compression library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
@ -27,11 +26,42 @@ base_chroot=yes
subpackages="bzip2-devel"
Add_dependency run glibc
pre_build()
do_build()
{
# Do not overwrite CC!
for f in Makefile Makefile-libbz2_so; do
sed -i -e "s|\(CC\)\(=gcc\)|\1?\2|g" \
${wrksrc}/${f} || return 1
done
# Add large-file support
sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i Makefile-libbz2_so
# use our optimization
sed -i "s|-O2|${CFLAGS}|g" Makefile
sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
make ${makejobs} -f Makefile-libbz2_so
make ${makejobs} bzip2recover libbz2.a
}
do_install()
{
install -dm755 ${DESTDIR}/bin
install -m755 bzip2-shared ${DESTDIR}/bin/bzip2
install -m755 bzip2recover ${DESTDIR}/bin
ln -sf bzip2 ${DESTDIR}/bin/bunzip2
ln -sf bzip2 ${DESTDIR}/bin/bzcat
install -dm755 ${DESTDIR}/usr/bin
install -m755 bzdiff bzgrep bzmore ${DESTDIR}/usr/bin
install -Dm755 libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.${version}
ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so
ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1
ln -s libbz2.so.${version} ${DESTDIR}/lib/libbz2.so.1.0
install -Dm644 libbz2.a ${DESTDIR}/usr/lib/libbz2.a
ln -sf ../../lib/libbz2.so ${DESTDIR}/usr/lib/libbz2.so
install -Dm644 bzlib.h ${DESTDIR}/usr/include/bzlib.h
install -Dm644 bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2.1
ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bunzip2.1
ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzcat.1
ln -sf bzip2.1 ${DESTDIR}/usr/share/man/man1/bzip2recover.1
}