diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-14 17:53:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-14 17:53:20 +0100 |
| commit | f67b4be3be5d03a688bbbf7a54df25ca16caa475 (patch) | |
| tree | 21b9c0f3095f1615121ea986af5e5152c8c564d2 /package/bzip2/patches/patch-Makefile-libbz2_so | |
| parent | c6d7c45aeb5f365a69d93f01a0365edc24db67ce (diff) | |
| parent | be769dc45c2063408845ccaed62ef34404f42d68 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/bzip2/patches/patch-Makefile-libbz2_so')
| -rw-r--r-- | package/bzip2/patches/patch-Makefile-libbz2_so | 23 |
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) |