Re: [Buildroot] [PATCH] package/bzip2: Remove stale patch file

[Charlie Jenkins <charlie@rivosinc.com>]

On Mon, Apr 07, 2025 at 04:27:54PM -0700, Charlie Jenkins wrote:
> Since bzip2 has been bumped to 1.0.8, the patch file that only affects
> 1.06 hasn't been relevant so remove it.

I had a bad setup and was thrown off by "bzip2-1.0.6". This seems to
apply normally on 1.0.8 so I guess this patch can be ignored.

- Charlie

> 
> Fixes: 7ae14d201e14 ("package/bzip2: security bump version to 1.0.8")
> Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
> ---
>  package/bzip2/0001-build-objects-twice.patch       | 58 ----------------------
>  ...ystem.patch => 0001-improve-build-system.patch} |  0
>  2 files changed, 58 deletions(-)
> 
> diff --git a/package/bzip2/0001-build-objects-twice.patch b/package/bzip2/0001-build-objects-twice.patch
> deleted file mode 100644
> index 52b234f65a8eb1a9aa3c907e9a4718b577401eb1..0000000000000000000000000000000000000000
> --- a/package/bzip2/0001-build-objects-twice.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -Build objects twice for shared and static libraries
> -
> -The existing Makefile causes problems on MIPS because the same object
> -files (not compiled with -fPIC) are used in static and shared libraries.
> -MIPS will refuce to link non-pic objects in shared libraries.
> -We fix this problems by creating a new rule for the shared library
> -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 <markos.chandras@imgtec.com>
> -[Dario: make the patch to be applied with fuzz factor 0]
> -Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> -
> -Index: bzip2-1.0.6/Makefile-libbz2_so
> -===================================================================
> ---- bzip2-1.0.6.orig/Makefile-libbz2_so
> -+++ bzip2-1.0.6/Makefile-libbz2_so
> -@@ -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    \
> --      crctable.o   \
> --      randtable.o  \
> --      compress.o   \
> --      decompress.o \
> --      bzlib.o
> -+OBJS= blocksort.sho  \
> -+      huffman.sho    \
> -+      crctable.sho   \
> -+      randtable.sho  \
> -+      compress.sho   \
> -+      decompress.sho \
> -+      bzlib.sho
> - 
> - all: $(OBJS)
> - 	$(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.8 libbz2.so.1.0 bzip2-shared
> - 
> --blocksort.o: blocksort.c
> --	$(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
> -+%.sho: %.c
> -+	$(CC) $(CFLAGS) -o $@ -c $<
> diff --git a/package/bzip2/0002-improve-build-system.patch b/package/bzip2/0001-improve-build-system.patch
> similarity index 100%
> rename from package/bzip2/0002-improve-build-system.patch
> rename to package/bzip2/0001-improve-build-system.patch
> 
> ---
> base-commit: af094ed137d6967afb6270b69c516a22eb9d8091
> change-id: 20250407-fixup_bzip2-3fbf6ebde7ee
> -- 
> - Charlie
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot