diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 08:43:51 +0100 |
| commit | 043601ef5ccc17b3aac714be38889c07b6b5b6f3 (patch) | |
| tree | 3581a07a1a001b919b7515e5baf2d78d0151a6e5 /package/bzip2 | |
| parent | 6b521744a3b178dc910a46191aed8cf75de1cee7 (diff) | |
| parent | 69d9bac9dad423e4cabf7bfa97a7765e4c442104 (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 | 24 |
2 files changed, 26 insertions, 8 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 e71dab136..148c7562a 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,15 +1,33 @@ --- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 -+++ bzip2-1.0.6/Makefile-libbz2_so 2013-07-30 14:15:29.000000000 +0200 -@@ -22,9 +22,10 @@ ++++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-13 21:51:20.000000000 +0100 +@@ -21,10 +21,18 @@ + # ------------------------------------------------------------------ - SHELL=/bin/sh +-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?= +CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) ++OS=$(shell uname) ++LDOPT=-soname ++ifneq ($(CROSS_COMPILE),1) ++ifeq ($(OS),Darwin) ++LDOPT=-install_name ++endif ++endif 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 |