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

bzip2: don't forget to install the shared lib and fix its soname.

Browse source 
--HG--
extra : convert_revision : 13e3b4349de90a45efc784e4280de79ca5dc6977
This commit is contained in:
Juan RP 2009-02-18 03:13:38 +01:00
parent a66b2e5fcc
commit 59a2ac4118
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
templates/bzip2/build.diff Normal file
View file

@ -0,0 +1,22 @@
--- Makefile-libbz2_so.orig 2007-12-09 14:00:50.000000000 +0100
+++ Makefile-libbz2_so 2009-02-18 02:30:10.000000000 +0100
@@ -35,13 +35,14 @@ OBJS= blocksort.o \
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
+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5 $(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.5
+ ln -s libbz2.so.1.0.5 libbz2.so
+ ln -s libbz2.so.1.0.5 libbz2.so.1
+ #ln -s libbz2.so.1.0.5 libbz2.so.1.0
clean:
- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
+ rm -f $(OBJS) bzip2.o libbz2.so.* bzip2-shared
blocksort.o: blocksort.c
$(CC) $(CFLAGS) -c blocksort.c

13
templates/bzip2/install.diff
View file

@ -1,5 +1,5 @@
--- Makefile.orig 2008-12-17 00:26:13.000000000 +0100
+++ Makefile 2008-12-17 00:29:28.000000000 +0100
--- 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'
@ -20,7 +20,7 @@
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
@@ -83,30 +83,29 @@ install: bzip2 bzip2recover
@@ -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
@ -31,7 +31,9 @@
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
- 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
@ -53,6 +55,7 @@
- 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
@ -61,6 +64,6 @@
+ 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 \