Patching makefiles instead of using sed.

Added experimental Makefile for dietlibc

2 files changed, 234 insertions, 0 deletions

diff --git a/sys-apps/bzip2/files/Makefile.dietlibc b/sys-apps/bzip2/files/Makefile.dietlibc
new file mode 100644
index 000000000000..b8ea78aa8424
--- /dev/null
+++ b/sys-apps/bzip2/files/Makefile.dietlibc
@@ -0,0 +1,143 @@
+
+SHELL=/bin/sh
+CC=gcc
+BIGFILES=-D_FILE_OFFSET_BITS=64
+CFLAGS=-Wall -Winline -O2 -mpentium -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+
+OBJS= blocksort.o  \
+      huffman.o    \
+      crctable.o   \
+      randtable.o  \
+      compress.o   \
+      decompress.o \
+      bzlib.o
+
+all: libbz2.a bzip2 bzip2recover test
+
+bzip2: libbz2.a bzip2.o
+	$(CC) $(CFLAGS) -o bzip2 bzip2.o -L. -lbz2
+
+bzip2recover: bzip2recover.o
+	$(CC) $(CFLAGS) -o bzip2recover bzip2recover.o
+
+libbz2.a: $(OBJS)
+	rm -f libbz2.a
+	gcc -o libbz2.a -nostdlib $(OBJS) /usr/lib/dietlibc.a /usr/lib/start.o -lgcc \
+		/usr/lib/fmt.a /usr/lib/str.a /usr/lib/stralloc.a \
+		/usr/lib/byte.a /usr/lib/open.a /usr/lib/scan.a /usr/lib/uint.a
+	@if ( test -f /usr/bin/ranlib -o -f /bin/ranlib -o \
+		-f /usr/ccs/bin/ranlib ) ; then \
+		echo ranlib libbz2.a ; \
+		ranlib libbz2.a ; \
+	fi
+
+test: bzip2
+	@cat words1
+	./bzip2 -1  < sample1.ref > sample1.rb2
+	./bzip2 -2  < sample2.ref > sample2.rb2
+	./bzip2 -3  < sample3.ref > sample3.rb2
+	./bzip2 -d  < sample1.bz2 > sample1.tst
+	./bzip2 -d  < sample2.bz2 > sample2.tst
+	./bzip2 -ds < sample3.bz2 > sample3.tst
+	cmp sample1.bz2 sample1.rb2 
+	cmp sample2.bz2 sample2.rb2
+	cmp sample3.bz2 sample3.rb2
+	cmp sample1.tst sample1.ref
+	cmp sample2.tst sample2.ref
+	cmp sample3.tst sample3.ref
+	@cat words3
+
+PREFIX=/usr
+
+install: bzip2 bzip2recover
+	if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi
+	if ( test ! -d $(PREFIX)/lib ) ; then mkdir $(PREFIX)/lib ; fi
+	if ( test ! -d $(PREFIX)/man ) ; then mkdir $(PREFIX)/man ; fi
+	if ( test ! -d $(PREFIX)/share/man/man1 ) ; then mkdir $(PREFIX)/share/man/man1 ; fi
+	if ( test ! -d $(PREFIX)/include ) ; then mkdir $(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)/share/man/man1
+	chmod a+r $(PREFIX)/share/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
+
+clean: 
+	rm -f *.o libbz2.a 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
+
+DISTNAME=bzip2-1.0.1
+tarfile:
+	rm -f $(DISTNAME)
+	ln -sf . $(DISTNAME)
+	tar cvf $(DISTNAME).tar \
+	   $(DISTNAME)/blocksort.c \
+	   $(DISTNAME)/huffman.c \
+	   $(DISTNAME)/crctable.c \
+	   $(DISTNAME)/randtable.c \
+	   $(DISTNAME)/compress.c \
+	   $(DISTNAME)/decompress.c \
+	   $(DISTNAME)/bzlib.c \
+	   $(DISTNAME)/bzip2.c \
+	   $(DISTNAME)/bzip2recover.c \
+	   $(DISTNAME)/bzlib.h \
+	   $(DISTNAME)/bzlib_private.h \
+	   $(DISTNAME)/Makefile \
+	   $(DISTNAME)/manual.texi \
+	   $(DISTNAME)/manual.ps \
+	   $(DISTNAME)/LICENSE \
+	   $(DISTNAME)/bzip2.1 \
+	   $(DISTNAME)/bzip2.1.preformatted \
+	   $(DISTNAME)/bzip2.txt \
+	   $(DISTNAME)/words0 \
+	   $(DISTNAME)/words1 \
+	   $(DISTNAME)/words2 \
+	   $(DISTNAME)/words3 \
+	   $(DISTNAME)/sample1.ref \
+	   $(DISTNAME)/sample2.ref \
+	   $(DISTNAME)/sample3.ref \
+	   $(DISTNAME)/sample1.bz2 \
+	   $(DISTNAME)/sample2.bz2 \
+	   $(DISTNAME)/sample3.bz2 \
+	   $(DISTNAME)/dlltest.c \
+	   $(DISTNAME)/*.html \
+	   $(DISTNAME)/README \
+	   $(DISTNAME)/README.COMPILATION.PROBLEMS \
+	   $(DISTNAME)/CHANGES \
+	   $(DISTNAME)/libbz2.def \
+	   $(DISTNAME)/libbz2.dsp \
+	   $(DISTNAME)/dlltest.dsp \
+	   $(DISTNAME)/makefile.msc \
+	   $(DISTNAME)/Y2K_INFO \
+	   $(DISTNAME)/unzcrash.c \
+	   $(DISTNAME)/spewG.c \
+	   $(DISTNAME)/Makefile-libbz2_so
diff --git a/sys-apps/bzip2/files/bzip2-1.0.1-Makefile-gentoo.diff b/sys-apps/bzip2/files/bzip2-1.0.1-Makefile-gentoo.diff
new file mode 100644
index 000000000000..1de2a5793c0d
--- /dev/null
+++ b/sys-apps/bzip2/files/bzip2-1.0.1-Makefile-gentoo.diff
@@ -0,0 +1,91 @@
+--- Makefile-libbz2_so.orig	Tue Feb 27 14:54:55 2001
++++ Makefile-libbz2_so	Tue Feb 27 14:55:42 2001
+@@ -8,7 +8,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-fpic -fPIC -Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -24,6 +24,15 @@
+ 	rm -f libbz2.so.1.0
+ 	ln -s libbz2.so.1.0.1 libbz2.so.1.0
+ 
++PREFIX=/usr
++DESTDIR=
++
++install: all
++	if ( test ! -d $(DESTDIR)/$(PREFIX)/lib ) ; then install -d $(DESTDIR)/$(PREFIX)/lib ; fi
++	cp -f libbz2.so.1.0.1 $(DESTDIR)/$(PREFIX)/lib
++	ln -sf libbz2.so.1.0.1 $(DESTDIR)/$(PREFIX)/lib/libbz2.so.1.0
++	ln -sf libbz2.so.1.0.1 $(DESTDIR)/$(PREFIX)/lib/libbz2.so
++
+ clean: 
+ 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.1 libbz2.so.1.0 bzip2-shared
+ 
+@@ -41,3 +50,5 @@
+ 	$(CC) $(CFLAGS) -c decompress.c
+ bzlib.o: bzlib.c
+ 	$(CC) $(CFLAGS) -c bzlib.c
++
++
+--- Makefile.orig	Tue Feb 27 14:54:55 2001
++++ Makefile	Tue Feb 27 14:54:55 2001
+@@ -2,7 +2,7 @@
+ SHELL=/bin/sh
+ CC=gcc
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS=-Wall -Winline -O2 -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
++CFLAGS+=-Wall -Winline -fomit-frame-pointer -fno-strength-reduce $(BIGFILES)
+ 
+ OBJS= blocksort.o  \
+       huffman.o    \
+@@ -46,27 +46,27 @@
+ 	@cat words3
+ 
+ PREFIX=/usr
++DESTDIR=
+ 
+ install: bzip2 bzip2recover
+-	if ( test ! -d $(PREFIX)/bin ) ; then mkdir $(PREFIX)/bin ; fi
+-	if ( test ! -d $(PREFIX)/lib ) ; then mkdir $(PREFIX)/lib ; fi
+-	if ( test ! -d $(PREFIX)/man ) ; then mkdir $(PREFIX)/man ; fi
+-	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir $(PREFIX)/man/man1 ; fi
+-	if ( test ! -d $(PREFIX)/include ) ; then mkdir $(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
++	if ( test ! -d $(DESTDIR)/$(PREFIX)/bin ) ; then install -d $(DESTDIR)/$(PREFIX)/bin ; fi
++	if ( test ! -d $(DESTDIR)/$(PREFIX)/lib ) ; then install -d $(DESTDIR)/$(PREFIX)/lib ; fi
++	if ( test ! -d $(DESTDIR)/$(PREFIX)/share/man/man1 ) ; then install -d $(DESTDIR)/$(PREFIX)/share/man/man1 ; fi
++	if ( test ! -d $(DESTDIR)/$(PREFIX)/include ) ; then install -d $(DESTDIR)/$(PREFIX)/include ; fi
++	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bzip2
++	cp -f bzip2 $(DESTDIR)/$(PREFIX)/bin/bunzip2
++	cp -f 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)/share/man/man1
++	chmod a+r $(DESTDIR)/$(PREFIX)/share/man/man1/bzip2.1
++	cp -f bzlib.h $(DESTDIR)/$(PREFIX)/include
++	chmod a+r $(DESTDIR)/$(PREFIX)/include/bzlib.h
++	cp -f libbz2.a $(DESTDIR)/$(PREFIX)/lib
++	chmod a+r $(DESTDIR)/$(PREFIX)/lib/libbz2.a
+ 
+ clean: 
+ 	rm -f *.o libbz2.a bzip2 bzip2recover \