[Lsb-messages] /var/www/bzr/lsb/devel/appbat r1029: Forgot to commit bzip2 1.0.6 patch

Mats Wichmann mats at linuxfoundation.org
Sat Apr 15 19:51:00 UTC 2017


------------------------------------------------------------
revno: 1029
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: appbat
timestamp: Sat 2017-04-15 13:51:00 -0600
message:
  Forgot to commit bzip2 1.0.6 patch
added:
  patches/bzip2-1.0.6.patch
-------------- next part --------------
=== added file 'patches/bzip2-1.0.6.patch'
--- a/patches/bzip2-1.0.6.patch	1970-01-01 00:00:00 +0000
+++ b/patches/bzip2-1.0.6.patch	2017-04-15 19:51:00 +0000
@@ -0,0 +1,95 @@
+--- bzip2-1.0.6/Makefile.lsbcc	2008-02-14 07:39:18.000000000 -0500
++++ bzip2-1.0.6/Makefile	2008-03-20 10:31:05.000000000 -0400
+@@ -15,16 +15,16 @@
+ SHELL=/bin/sh
+ 
+ # To assist in cross-compiling
+-CC=gcc
++CC=lsbcc
+ AR=ar
+ RANLIB=ranlib
+ LDFLAGS=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-fPIC -Wall -Winline -O2 -g $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+-PREFIX=/usr/local
++PREFIX=
+ 
+ 
+ OBJS= blocksort.o  \
+@@ -35,6 +35,11 @@ OBJS= blocksort.o  \
+       decompress.o \
+       bzlib.o
+ 
++prefix=		/opt/lsb/libbat
++bindir=		$(prefix)/bin
++libdir=		$(prefix)/lib
++mandir=		$(prefix)/share/man
++includedir=	$(prefix)/include
+ all: libbz2.a bzip2 bzip2recover test
+ 
+ bzip2: libbz2.a bzip2.o
+@@ -69,50 +74,22 @@ test: bzip2
+ 	cmp sample3.tst sample3.ref
+ 	@cat words3
+ 
+-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 $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
+-	cp -f bzip2 $(PREFIX)/bin/bzip2
+-	cp -f bzip2 $(PREFIX)/bin/bunzip2
+-	cp -f bzip2 $(PREFIX)/bin/bzcat
+-	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
+-	chmod a+x $(PREFIX)/bin/bzip2
+-	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 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 -f bzgrep $(PREFIX)/bin/bzgrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+-	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
+-	chmod a+x $(PREFIX)/bin/bzgrep
+-	cp -f bzmore $(PREFIX)/bin/bzmore
+-	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
+-	chmod a+x $(PREFIX)/bin/bzmore
+-	cp -f bzdiff $(PREFIX)/bin/bzdiff
+-	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/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
++install: libbz2.a
++	mkdir -p $(PREFIX)$(libdir)
++	install -c -m 0644 libbz2.a $(PREFIX)$(libdir)
++	mkdir -p $(PREFIX)$(includedir)
++	install -c -m 0644 bzlib.h $(PREFIX)$(includedir)
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
++.SUFFIXES: .c .o
++
++%.o: %.c bzlib.h bzlib_private.h
++	$(CC) $(CFLAGS) -c $<
++
+ blocksort.o: blocksort.c
+ 	@cat words0
+ 	$(CC) $(CFLAGS) -c blocksort.c



More information about the lsb-messages mailing list