summaryrefslogtreecommitdiff
path: root/package/bzip2
diff options
context:
space:
mode:
Diffstat (limited to 'package/bzip2')
-rw-r--r--package/bzip2/Makefile6
-rw-r--r--package/bzip2/patches/patch-Makefile-libbz2_so18
2 files changed, 16 insertions, 8 deletions
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index a2cb7a709..ae75f3b04 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -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..9948469c8 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,9 +1,17 @@
--- 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 14:31:10.000000000 +0100
+@@ -21,10 +21,17 @@
+ # ------------------------------------------------------------------
+
+
+-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)
+ifeq ($(OS),Darwin)
+LDOPT=-install_name
@@ -13,7 +21,7 @@
OBJS= blocksort.o \
huffman.o \
-@@ -35,7 +41,7 @@ OBJS= blocksort.o \
+@@ -35,7 +42,7 @@ OBJS= blocksort.o \
bzlib.o
all: $(OBJS)