diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-11 11:54:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-11 11:54:11 +0100 |
| commit | 563d3f06891425bccc590fdae189f9065258e758 (patch) | |
| tree | bcd7a3204fa53ff40f019446e2607ffc0106e0a3 | |
| parent | 361225c8f0951a2c59f00428a9a3317b67993138 (diff) | |
fix darwin build
| -rw-r--r-- | package/bzip2/patches/patch-Makefile-libbz2_so | 29 | ||||
| -rw-r--r-- | package/libglew/Makefile | 2 |
2 files changed, 20 insertions, 11 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 diff --git a/package/libglew/Makefile b/package/libglew/Makefile index d6aed4f12..8fd346821 100644 --- a/package/libglew/Makefile +++ b/package/libglew/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual -XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' +XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' SYSTEMS=linux libglew-install: $(INSTALL_DIR) $(IDIR_LIBGLEW)/usr/lib |