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