diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:13:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:13:59 +0100 |
| commit | 17a6468b3f0fae577b1aaad51b56bdefe15a25c1 (patch) | |
| tree | 2e0ccfed1a6a8afb24c2547ca97ae5d8c450b717 /package/bzip2 | |
| parent | 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f (diff) | |
| parent | c66e4117d3ac4d561718a8b17066dc8b04a02027 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/bzip2')
| -rw-r--r-- | package/bzip2/Makefile | 10 | ||||
| -rw-r--r-- | package/bzip2/patches/patch-Makefile-libbz2_so | 23 |
2 files changed, 21 insertions, 12 deletions
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile index a2cb7a709..5585ae0c1 100644 --- a/package/bzip2/Makefile +++ b/package/bzip2/Makefile @@ -34,8 +34,8 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_ HOST_STYLE:= manual MAKE_FILE:= Makefile-libbz2_so CONFIG_STYLE:= manual -TARGET_CFLAGS+= -fPIC -XAKE_FLAGS+= PREFIX=${WRKINST}/usr +TARGET_CFLAGS+= -fPIC +XAKE_FLAGS+= PREFIX=${WRKINST}/usr CROSS_COMPILE=1 INSTALL_STYLE:= manual host-build: @@ -55,9 +55,9 @@ libbz2-install: $(CP) ${WRKBUILD}/libbz2.so* \ ${IDIR_LIBBZ2}/usr/lib $(CP) ${WRKBUILD}/libbz2.so* \ - ${STAGING_DIR}/usr/lib - (cd ${STAGING_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) - $(CP) $(WRKBUILD)/bzlib.h $(STAGING_DIR)/usr/include + ${STAGING_TARGET_DIR}/usr/lib + (cd ${STAGING_TARGET_DIR}/usr/lib; ln -sf libbz2.so.1.0.6 libbz2.so) + $(CP) $(WRKBUILD)/bzlib.h $(STAGING_TARGET_DIR)/usr/include ${INSTALL_DIR} $(IDIR_LIBBZ2_DEV)/usr/include $(CP) $(WRKBUILD)/bzlib.h $(IDIR_LIBBZ2_DEV)/usr/include diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so index 605be4e5c..148c7562a 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,19 +1,28 @@ --- 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-10 21:37:37.000000000 +0100 -@@ -25,6 +25,12 @@ SHELL=/bin/sh - CC=gcc ++++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-13 21:51:20.000000000 +0100 +@@ -21,10 +21,18 @@ + # ------------------------------------------------------------------ + + +-SHELL=/bin/sh +-CC=gcc ++SHELL?=/bin/sh ++CC?=gcc BIGFILES=-D_FILE_OFFSET_BITS=64 - CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) +-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 -+else -+LDOPT=-soname ++endif +endif OBJS= blocksort.o \ huffman.o \ -@@ -35,7 +41,7 @@ OBJS= blocksort.o \ +@@ -35,7 +43,7 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) |