From df6e1dfc6d23ae8b46f7da64e07e5a1e06460d12 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Jan 2014 16:17:44 +0100 Subject: enable xbmc for ibmx40+musl, add system specific dependency for pkgmaker/depmaker, port eudev and rework systemd package (not ready) --- package/bzip2/patches/patch-Makefile-libbz2_so | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'package/bzip2/patches/patch-Makefile-libbz2_so') diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so index 605be4e5c..9948469c8 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,9 +1,17 @@ --- 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 14:31:10.000000000 +0100 +@@ -21,10 +21,17 @@ + # ------------------------------------------------------------------ + + +-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) +ifeq ($(OS),Darwin) +LDOPT=-install_name @@ -13,7 +21,7 @@ OBJS= blocksort.o \ huffman.o \ -@@ -35,7 +41,7 @@ OBJS= blocksort.o \ +@@ -35,7 +42,7 @@ OBJS= blocksort.o \ bzlib.o all: $(OBJS) -- cgit v1.2.3 From a07917a27a75e9932d39e2527e9e8fa6a748a017 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 13 Jan 2014 21:54:13 +0100 Subject: fix cross-compile on Darwin (again) --- package/bzip2/patches/patch-Makefile-libbz2_so | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'package/bzip2/patches/patch-Makefile-libbz2_so') 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