summaryrefslogtreecommitdiff
path: root/package/bzip2/patches/patch-Makefile-libbz2_so
diff options
context:
space:
mode:
Diffstat (limited to 'package/bzip2/patches/patch-Makefile-libbz2_so')
-rw-r--r--package/bzip2/patches/patch-Makefile-libbz2_so24
1 files changed, 21 insertions, 3 deletions
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