diff --git a/system/extra/bzip2/makefile.patch b/system/extra/bzip2/makefile.patch new file mode 100644 index 00000000..a54c9fb6 --- /dev/null +++ b/system/extra/bzip2/makefile.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index fb0f230..3c101bd 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,10 +35,8 @@ OBJS= blocksort.o \ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) -shared -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.8 libbz2.so.1.0 + + clean: + rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared diff --git a/system/extra/bzip2/ympbuild b/system/extra/bzip2/ympbuild index 29fc0da9..e7b96410 100644 --- a/system/extra/bzip2/ympbuild +++ b/system/extra/bzip2/ympbuild @@ -16,6 +16,8 @@ setup(){ mkdir -p $name-shared cp *.c *.h $name-shared cp Makefile-libbz2_so $name-shared/Makefile + cd $name-shared + patch -Np1 < ../../makefile.patch } build(){ export CFLAGS="-Winline -D_FILE_OFFSET_BITS=64 ${CFLAGS}" @@ -31,9 +33,10 @@ package(){ ln -sf bzip2 "${DESTDIR}"/usr/bin/bzcat install -m755 libbz2.a "${DESTDIR}"/usr/lib64/ - install -m755 $name-shared/libbz2.so* "${DESTDIR}"/usr/lib64 + install -m755 $name-shared/libbz2.so.${version} "${DESTDIR}"/usr/lib64 ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1 + ln -s libbz2.so.$version "${DESTDIR}"/usr/lib64/libbz2.so.1.0 install -m644 bzlib.h "${DESTDIR}"/usr/include/