[ptxdist] [PATCH 10/28] bzip2: clean up patches

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCH 10/28] bzip2: clean up patches
Date: Sun, 30 Oct 2011 23:00:41 +0100	[thread overview]
Message-ID: <1320012059-24971-10-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1320012059-24971-1-git-send-email-r.schwebel@pengutronix.de>

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 patches/bzip2-1.0.5/0001-fixup-Makefile.patch |  209 +++++++++++++++++++++++++
 patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff |  207 ------------------------
 patches/bzip2-1.0.5/series                    |    1 -
 3 files changed, 209 insertions(+), 208 deletions(-)
 create mode 100644 patches/bzip2-1.0.5/0001-fixup-Makefile.patch
 delete mode 100644 patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
 delete mode 100644 patches/bzip2-1.0.5/series

diff --git a/patches/bzip2-1.0.5/0001-fixup-Makefile.patch b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
new file mode 100644
index 0000000..a11d857
--- /dev/null
+++ b/patches/bzip2-1.0.5/0001-fixup-Makefile.patch
@@ -0,0 +1,209 @@
+From 6acc3dd29e3e588d445efc7c1c7e94059f688c89 Mon Sep 17 00:00:00 2001
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:59:40 +0200
+Subject: [PATCH] fixup Makefile
+
+This patch fixes various problems in the makefile and disables compile
+time test. It was taken from Debinan.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile |  134 ++++++++++++++++++++++++++++++++------------------------------
+ 1 files changed, 69 insertions(+), 65 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eb09753..8b1bf77 100644
+--- a/Makefile
++++ b/Makefile
+@@ -12,6 +12,8 @@
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+ 
++somajor=1.0
++sominor=$(somajor).4
+ SHELL=/bin/sh
+ 
+ # To assist in cross-compiling
+@@ -21,7 +23,7 @@ RANLIB=ranlib
+ LDFLAGS=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX=/usr/local
+@@ -35,9 +37,9 @@ OBJS= blocksort.o  \
+       decompress.o \
+       bzlib.o
+ 
+-all: libbz2.a bzip2 bzip2recover test
++all: libbz2.a bzip2 bzip2recover # test
+ 
+-bzip2: libbz2.a bzip2.o
++bzip2: libbz2.so bzip2.o
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
+ 
+ bzip2recover: bzip2recover.o
+@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
+ libbz2.a: $(OBJS)
+ 	rm -f libbz2.a
+ 	$(AR) cq libbz2.a $(OBJS)
+-	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
+-		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
++	@if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
++		test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
+ 		echo $(RANLIB) libbz2.a ; \
+ 		$(RANLIB) libbz2.a ; \
+ 	fi
+ 
++libbz2.so: libbz2.so.$(somajor)
++	ln -sf $^ $@
++
++libbz2.so.$(somajor): libbz2.so.$(sominor)
++	ln -sf $^ $@
++
++libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
++	$(CC) -o libbz2.so.$(sominor) -shared \
++	  -Wl,-soname,libbz2.so.$(somajor) $^ -lc
++
++%.sho: %.c
++	$(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
++
++%.o: %.c
++	$(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
++
+ check: test
+ test: bzip2
+ 	@cat words1
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -1  < sample1.ref > sample1.rb2
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -2  < sample2.ref > sample2.rb2
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -3  < sample3.ref > sample3.rb2
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -d  < sample1.bz2 > sample1.tst
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -d  < sample2.bz2 > sample2.tst
++	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
+ 	./bzip2 -ds < sample3.bz2 > sample3.tst
+ 	cmp sample1.bz2 sample1.rb2 
+ 	cmp sample2.bz2 sample2.rb2
+@@ -69,73 +93,53 @@ 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: bzip2 bzip2recover libbz2.a
++	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
++	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
++	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
++	ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
++	ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
++	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
++	cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
++	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
++	cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
++	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
++	cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
++	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
++	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
++	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
++	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
++	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
++	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
++	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
++	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
++	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
++	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
++	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
++	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
++	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
++	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
++	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
++	echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
++	echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
+ 
+ clean: 
+-	rm -f *.o libbz2.a bzip2 bzip2recover \
++	rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
+ 	sample1.rb2 sample2.rb2 sample3.rb2 \
+ 	sample1.tst sample2.tst sample3.tst
+ 
+-blocksort.o: blocksort.c
+-	@cat words0
+-	$(CC) $(CFLAGS) -c blocksort.c
+-huffman.o: huffman.c
+-	$(CC) $(CFLAGS) -c huffman.c
+-crctable.o: crctable.c
+-	$(CC) $(CFLAGS) -c crctable.c
+-randtable.o: randtable.c
+-	$(CC) $(CFLAGS) -c randtable.c
+-compress.o: compress.c
+-	$(CC) $(CFLAGS) -c compress.c
+-decompress.o: decompress.c
+-	$(CC) $(CFLAGS) -c decompress.c
+-bzlib.o: bzlib.c
+-	$(CC) $(CFLAGS) -c bzlib.c
+-bzip2.o: bzip2.c
+-	$(CC) $(CFLAGS) -c bzip2.c
+-bzip2recover.o: bzip2recover.c
+-	$(CC) $(CFLAGS) -c bzip2recover.c
+-
+ 
+ distclean: clean
+-	rm -f manual.ps manual.html manual.pdf
++	#rm -f manual.ps manual.html manual.pdf
+ 
+ DISTNAME=bzip2-1.0.5
+ dist: check manual
+-- 
+1.7.7
+
diff --git a/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff b/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
deleted file mode 100644
index 3aa4c79..0000000
--- a/patches/bzip2-1.0.5/bzip2-1.0.5_Makefile.diff
+++ /dev/null
@@ -1,207 +0,0 @@
-Subject: [patch] fixup Makefile
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-
-This patch fixes various problems in the makefile and disables compile
-time test. It was taken from Debinan.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-# 20091210 rsc: needs probably another look before going mainline
-
- Makefile |  134 ++++++++++++++++++++++++++++++++-------------------------------
- 1 file changed, 69 insertions(+), 65 deletions(-)
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -12,6 +12,8 @@
- # in the file LICENSE.
- # ------------------------------------------------------------------
- 
-+somajor=1.0
-+sominor=$(somajor).4
- SHELL=/bin/sh
- 
- # To assist in cross-compiling
-@@ -21,7 +23,7 @@ RANLIB=ranlib
- LDFLAGS=
- 
- BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) $(DEBCFLAGS)
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -35,9 +37,9 @@ OBJS= blocksort.o  \
-       decompress.o \
-       bzlib.o
- 
--all: libbz2.a bzip2 bzip2recover test
-+all: libbz2.a bzip2 bzip2recover # test
- 
--bzip2: libbz2.a bzip2.o
-+bzip2: libbz2.so bzip2.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
- 
- bzip2recover: bzip2recover.o
-@@ -46,20 +48,42 @@ bzip2recover: bzip2recover.o
- libbz2.a: $(OBJS)
- 	rm -f libbz2.a
- 	$(AR) cq libbz2.a $(OBJS)
--	@if ( test -f $(RANLIB) -o -f /usr/bin/ranlib -o \
--		-f /bin/ranlib -o -f /usr/ccs/bin/ranlib ) ; then \
-+	@if ( test -f $(RANLIB) || test -f /usr/bin/ranlib || \
-+		test -f /bin/ranlib || test -f /usr/ccs/bin/ranlib ) ; then \
- 		echo $(RANLIB) libbz2.a ; \
- 		$(RANLIB) libbz2.a ; \
- 	fi
- 
-+libbz2.so: libbz2.so.$(somajor)
-+	ln -sf $^ $@
-+
-+libbz2.so.$(somajor): libbz2.so.$(sominor)
-+	ln -sf $^ $@
-+
-+libbz2.so.$(sominor): $(OBJS:%.o=%.sho)
-+	$(CC) -o libbz2.so.$(sominor) -shared \
-+	  -Wl,-soname,libbz2.so.$(somajor) $^ -lc
-+
-+%.sho: %.c
-+	$(CC) $(CFLAGS) -D_REENTRANT -fPIC -o $@ -c $<
-+
-+%.o: %.c
-+	$(CC) $(CFLAGS) -D_REENTRANT -o $@ -c $<
-+
- check: test
- test: bzip2
- 	@cat words1
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -1  < sample1.ref > sample1.rb2
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -2  < sample2.ref > sample2.rb2
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -3  < sample3.ref > sample3.rb2
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -d  < sample1.bz2 > sample1.tst
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -d  < sample2.bz2 > sample2.tst
-+	LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH \
- 	./bzip2 -ds < sample3.bz2 > sample3.tst
- 	cmp sample1.bz2 sample1.rb2 
- 	cmp sample2.bz2 sample2.rb2
-@@ -69,73 +93,53 @@ 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: bzip2 bzip2recover libbz2.a
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/bin ) ; then mkdir -p $(DESTDIR)$(PREFIX)/bin ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/lib ) ; then mkdir -p $(DESTDIR)$(PREFIX)/lib ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/man ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/man/man1 ) ; then mkdir -p $(DESTDIR)$(PREFIX)/man/man1 ; fi
-+	if ( test ! -d $(DESTDIR)$(PREFIX)/include ) ; then mkdir -p $(DESTDIR)$(PREFIX)/include ; fi
-+	cp -f bzip2 $(DESTDIR)$(PREFIX)/bin/bzip2
-+	ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	ln $(DESTDIR)$(PREFIX)/bin/bzip2 $(DESTDIR)$(PREFIX)/bin/bzcat
-+	cp -f bzip2recover $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bunzip2
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzcat
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzip2recover
-+	cp -f bzip2.1 $(DESTDIR)$(PREFIX)/man/man1
-+	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzip2.1
-+	cp -f bzlib.h $(DESTDIR)$(PREFIX)/include
-+	chmod a+r $(DESTDIR)$(PREFIX)/include/bzlib.h
-+	cp -fa libbz2.a libbz2.so* $(DESTDIR)$(PREFIX)/lib
-+	chmod a+r $(DESTDIR)$(PREFIX)/lib/libbz2.a
-+	cp -f bzgrep $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzegrep
-+	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzgrep $(DESTDIR)$(PREFIX)/bin/bzfgrep
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzgrep
-+	cp -f bzmore $(DESTDIR)$(PREFIX)/bin/bzmore
-+	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzmore $(DESTDIR)$(PREFIX)/bin/bzless
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzmore
-+	cp -f bzdiff $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	ln -s -f $(DESTDIR)$(PREFIX)/bin/bzdiff $(DESTDIR)$(PREFIX)/bin/bzcmp
-+	chmod a+x $(DESTDIR)$(PREFIX)/bin/bzdiff
-+	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(DESTDIR)$(PREFIX)/man/man1
-+	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzgrep.1
-+	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzmore.1
-+	chmod a+r $(DESTDIR)$(PREFIX)/man/man1/bzdiff.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzegrep.1
-+	echo ".so man1/bzgrep.1" > $(DESTDIR)$(PREFIX)/man/man1/bzfgrep.1
-+	echo ".so man1/bzmore.1" > $(DESTDIR)$(PREFIX)/man/man1/bzless.1
-+	echo ".so man1/bzdiff.1" > $(DESTDIR)$(PREFIX)/man/man1/bzcmp.1
- 
- clean: 
--	rm -f *.o libbz2.a bzip2 bzip2recover \
-+	rm -f *.o *.sho libbz2.a libbz2.so* bzip2 bzip2recover \
- 	sample1.rb2 sample2.rb2 sample3.rb2 \
- 	sample1.tst sample2.tst sample3.tst
- 
--blocksort.o: blocksort.c
--	@cat words0
--	$(CC) $(CFLAGS) -c blocksort.c
--huffman.o: huffman.c
--	$(CC) $(CFLAGS) -c huffman.c
--crctable.o: crctable.c
--	$(CC) $(CFLAGS) -c crctable.c
--randtable.o: randtable.c
--	$(CC) $(CFLAGS) -c randtable.c
--compress.o: compress.c
--	$(CC) $(CFLAGS) -c compress.c
--decompress.o: decompress.c
--	$(CC) $(CFLAGS) -c decompress.c
--bzlib.o: bzlib.c
--	$(CC) $(CFLAGS) -c bzlib.c
--bzip2.o: bzip2.c
--	$(CC) $(CFLAGS) -c bzip2.c
--bzip2recover.o: bzip2recover.c
--	$(CC) $(CFLAGS) -c bzip2recover.c
--
- 
- distclean: clean
--	rm -f manual.ps manual.html manual.pdf
-+	#rm -f manual.ps manual.html manual.pdf
- 
- DISTNAME=bzip2-1.0.5
- dist: check manual
diff --git a/patches/bzip2-1.0.5/series b/patches/bzip2-1.0.5/series
deleted file mode 100644
index 5a7c5de..0000000
--- a/patches/bzip2-1.0.5/series
+++ /dev/null
@@ -1 +0,0 @@
-bzip2-1.0.5_Makefile.diff 
-- 
1.7.7


-- 
ptxdist mailing list
ptxdist@pengutronix.de

next prev parent reply	other threads:[~2011-10-30 22:00 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-30 22:00 [ptxdist] Patch cleanup Robert Schwebel
2011-10-30 22:00 ` [ptxdist] [PATCH 01/28] canfestival: clean up patches Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 02/28] devicekit-disks: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 03/28] mplayer: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 04/28] policykit: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 05/28] sdl: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 06/28] sdl-mixer: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 07/28] atop: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 08/28] bing: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 09/28] bridge-utils: " Robert Schwebel
2011-10-30 22:00   ` Robert Schwebel [this message]
2011-10-30 22:00   ` [ptxdist] [PATCH 11/28] cbmbasic: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 12/28] cpufrequtils: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 13/28] cvs: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 14/28] daemonize: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 15/28] dibbler: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 16/28] e2fsprogs: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 17/28] efax: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 18/28] eggdbus: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 19/28] elektra: remove orphaned package Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 20/28] etherwake: clean up patches Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 21/28] fakeroot: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 22/28] fbtest: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 23/28] font-alias: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 24/28] freetype: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 25/28] glademm: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 26/28] gpsd: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 27/28] gst-plugins-gl: " Robert Schwebel
2011-10-30 22:00   ` [ptxdist] [PATCH 28/28] gtk: " Robert Schwebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1320012059-24971-10-git-send-email-r.schwebel@pengutronix.de \
    --to=r.schwebel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox