From a07917a27a75e9932d39e2527e9e8fa6a748a017 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Mon, 13 Jan 2014 21:54:13 +0100
Subject: fix cross-compile on Darwin (again)

---
 package/bzip2/Makefile                         |  4 ++--
 package/bzip2/patches/patch-Makefile-libbz2_so | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'package/bzip2')

diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index ae75f3b04..5585ae0c1 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -34,8 +34,8 @@ $(eval $(call PKG_template,LIBBZ2,libbz2,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_
 HOST_STYLE:=		manual
 MAKE_FILE:=		Makefile-libbz2_so
 CONFIG_STYLE:=		manual
-TARGET_CFLAGS+=		-fPIC
-XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
+TARGET_CFLAGS+=		-fPIC 
+XAKE_FLAGS+=		PREFIX=${WRKINST}/usr CROSS_COMPILE=1
 INSTALL_STYLE:=		manual
 
 host-build:
diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so
index 9948469c8..148c7562a 100644
--- a/package/bzip2/patches/patch-Makefile-libbz2_so
+++ b/package/bzip2/patches/patch-Makefile-libbz2_so
@@ -1,6 +1,6 @@
 --- 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-13 14:31:10.000000000 +0100
-@@ -21,10 +21,17 @@
++++ bzip2-1.0.6/Makefile-libbz2_so	2014-01-13 21:51:20.000000000 +0100
+@@ -21,10 +21,18 @@
  # ------------------------------------------------------------------
  
  
@@ -13,15 +13,16 @@
 +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 +42,7 @@ OBJS= blocksort.o  \
+@@ -35,7 +43,7 @@ OBJS= blocksort.o  \
        bzlib.o
  
  all: $(OBJS)
-- 
cgit v1.2.3