diff options
Diffstat (limited to 'package/bzip2')
| -rw-r--r-- | package/bzip2/Makefile | 19 | ||||
| -rw-r--r-- | package/bzip2/patches/patch-Makefile | 6 | ||||
| -rw-r--r-- | package/bzip2/patches/patch-Makefile-libbz2_so | 24 |
3 files changed, 19 insertions, 30 deletions
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index 7f7336e4b..723d1abcc 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bzip2 -PKG_VERSION:= 1.0.6 -PKG_RELEASE:= 3 -PKG_HASH:= a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd +PKG_VERSION:= 1.0.8 +PKG_RELEASE:= 1 +PKG_HASH:= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 PKG_DESCR:= compression utility PKG_SECTION:= app/archive PKG_BUILDDEP:= bzip2-host PKG_DEPENDS:= libbz2 HOST_BUILDDEP:= patch-host PKG_URL:= http://www.bzip.org/ -PKG_SITES:= http://www.bzip.org/${PKG_VERSION}/ +PKG_SITES:= https://sourceware.org/pub/bzip2/ PKG_LIBNAME:= libbz2 PKG_OPTS:= dev @@ -31,7 +31,7 @@ $(eval $(call PKG_template,BZIP2,bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBZ2},${PKGSC_LIBBZ2},${PKG_OPTS})) HOST_STYLE:= manual -HOST_MAKE_FILE:= Makefile +HOST_MAKE_FILE:= Makefile-libbz2_so ifneq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) MAKE_FILE:= Makefile-libbz2_so @@ -50,8 +50,13 @@ host-build: PREFIX=${HOST_WRKINST}/usr ${HOST_ALL_TARGET}) bzip2-hostinstall: + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/include + $(CP) ${WRKBUILD}/bzlib.h ${STAGING_HOST_DIR}/usr/include + ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/lib + $(CP) ${WRKBUILD}/libbz2.so* ${STAGING_HOST_DIR}/usr/lib + (cd ${STAGING_HOST_DIR}/usr/lib; ln -sf libbz2.so.1.0.8 libbz2.so) ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin - $(INSTALL_BIN) ${WRKBUILD}/bzip2 ${STAGING_HOST_DIR}/usr/bin/bzip2 + $(INSTALL_BIN) ${WRKBUILD}/bzip2-shared ${STAGING_HOST_DIR}/usr/bin/bzip2 do-install: ${INSTALL_DIR} $(STAGING_TARGET_DIR)/usr/include @@ -66,7 +71,7 @@ libbz2-install: ${IDIR_LIBBZ2}/usr/lib $(CP) ${WRKBUILD}/libbz2.so* \ ${STAGING_TARGET_DIR}/usr/lib - (cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) + (cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.8 libbz2.so) ${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include $(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include diff --git a/package/bzip2/patches/patch-Makefile b/package/bzip2/patches/patch-Makefile index 0d15eab68..3fbb45234 100644 --- a/package/bzip2/patches/patch-Makefile +++ b/package/bzip2/patches/patch-Makefile @@ -1,5 +1,5 @@ ---- bzip2-1.0.5.orig/Makefile 2008-02-14 13:39:18.000000000 +0100 -+++ bzip2-1.0.5/Makefile 2009-08-23 20:18:12.000000000 +0200 +--- bzip2-1.0.8.orig/Makefile 2019-07-13 19:50:05.000000000 +0200 ++++ bzip2-1.0.8/Makefile 2020-04-02 00:14:59.333485383 +0200 @@ -15,16 +15,16 @@ SHELL=/bin/sh @@ -19,7 +19,7 @@ # Where you want it installed when you do 'make install' -PREFIX=/usr/local -+PREFIX?=/usr ++PREFIX=/usr OBJS= blocksort.o \ diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so index 148c7562a..9d901f6bc 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,6 +1,6 @@ ---- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 -+++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-13 21:51:20.000000000 +0100 -@@ -21,10 +21,18 @@ +--- bzip2-1.0.8.orig/Makefile-libbz2_so 2019-07-13 19:50:05.000000000 +0200 ++++ bzip2-1.0.8/Makefile-libbz2_so 2020-04-02 00:16:39.699887764 +0200 +@@ -21,10 +21,11 @@ # ------------------------------------------------------------------ @@ -11,23 +11,7 @@ BIGFILES=-D_FILE_OFFSET_BITS=64 -CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +CFLAGS?= -+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) -+OS=$(shell uname) -+LDOPT=-soname -+ifneq ($(CROSS_COMPILE),1) -+ifeq ($(OS),Darwin) -+LDOPT=-install_name -+endif -+endif ++CFLAGS+=-fpic -fPIC -Wall -Winline -g $(BIGFILES) OBJS= blocksort.o \ huffman.o \ -@@ -35,7 +43,7 @@ OBJS= blocksort.o \ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) -shared -Wl,$(LDOPT) -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 |