diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-12 13:01:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-12 13:01:44 +0100 |
| commit | 7bd70b733a54b6d1d26fd0f570328c95cc4858ef (patch) | |
| tree | 6af6cd410241c6bfb050c020fe685cd1e8c00f67 /package/bzip2 | |
| parent | 535d9124e1f78b15e0ecb32818bd4583cbab1d50 (diff) | |
| parent | 501363db19756c4f82a67b822a00e8444d3962cf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/bzip2')
| -rw-r--r-- | package/bzip2/patches/patch-Makefile-libbz2_so | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so index e71dab136..605be4e5c 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,15 +1,24 @@ --- 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 @@ - - - SHELL=/bin/sh --CC=gcc -+CC?=gcc ++++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-10 21:37:37.000000000 +0100 +@@ -25,6 +25,12 @@ 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) + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++OS=$(shell uname) ++ifeq ($(OS),Darwin) ++LDOPT=-install_name ++else ++LDOPT=-soname ++endif OBJS= blocksort.o \ huffman.o \ +@@ -35,7 +41,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 |