diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch index 9bde0f6488..52b234f65a 100644 --- a/package/bzip2/0001-build-objects-twice.patch +++ b/package/bzip2/0001-build-objects-twice.patch @@ -8,14 +8,16 @@ and build the shared objects as *.sho instead of *.o. Then, we use these objects to create the shared library. Signed-off-by: Markos Chandras +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: bzip2-1.0.6/Makefile-libbz2_so =================================================================== --- bzip2-1.0.6.orig/Makefile-libbz2_so +++ bzip2-1.0.6/Makefile-libbz2_so -@@ -25,13 +25,13 @@ SHELL=/bin/sh - CC=gcc - override CFLAGS += -fpic -fPIC -Wall +@@ -26,13 +26,13 @@ CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -OBJS= blocksort.o \ - huffman.o \ @@ -33,10 +35,10 @@ Index: bzip2-1.0.6/Makefile-libbz2_so + bzlib.sho all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -@@ -45,17 +45,5 @@ install: + $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) +@@ -43,17 +43,5 @@ all: $(OBJS) clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared -blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0002-improve-build-system.patch index 2d6e2cf900..11a856e49c 100644 --- a/package/bzip2/0002-improve-build-system.patch +++ b/package/bzip2/0002-improve-build-system.patch @@ -20,12 +20,14 @@ This patch makes a number of improvements to the bzip2 build system: appropriate symbolic links. Signed-off-by: Thomas Petazzoni +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/Makefile =================================================================== --- a/Makefile +++ b/Makefile -@@ -20,8 +20,7 @@ +@@ -20,8 +20,7 @@ AR=ar RANLIB=ranlib LDFLAGS= @@ -35,7 +37,7 @@ Index: b/Makefile # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -90,14 +89,14 @@ +@@ -90,14 +89,14 @@ install: bzip2 bzip2recover cp -f libbz2.a $(PREFIX)/lib chmod a+r $(PREFIX)/lib/libbz2.a cp -f bzgrep $(PREFIX)/bin/bzgrep @@ -66,9 +68,9 @@ Index: b/Makefile-libbz2_so -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +override CFLAGS += -fpic -fPIC -Wall - OBJS= blocksort.o \ - huffman.o \ -@@ -37,8 +36,11 @@ + OBJS= blocksort.sho \ + huffman.sho \ +@@ -37,8 +36,11 @@ OBJS= blocksort.sho \ all: $(OBJS) $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8