summaryrefslogtreecommitdiff
path: root/package/zip/patches
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-10-20 10:51:30 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-10-20 10:51:30 +0200
commit00bca586c4f68b2a846b9e2a04ec7245a9f0d881 (patch)
tree389d57da3148d38d0a954b96c042f2fc7e2b2fc0 /package/zip/patches
parent11a26c7947fc54521e5e380518937dba7f07d8ca (diff)
fix cross-compiling issues
Diffstat (limited to 'package/zip/patches')
-rw-r--r--package/zip/patches/patch-unix_Makefile33
-rw-r--r--package/zip/patches/patch-unix_Makefile.orig29
2 files changed, 62 insertions, 0 deletions
diff --git a/package/zip/patches/patch-unix_Makefile b/package/zip/patches/patch-unix_Makefile
new file mode 100644
index 000000000..426f6869e
--- /dev/null
+++ b/package/zip/patches/patch-unix_Makefile
@@ -0,0 +1,33 @@
+--- zip30.orig/unix/Makefile 2008-05-07 08:33:56.000000000 +0200
++++ zip30/unix/Makefile 2011-10-19 22:21:08.000000000 +0200
+@@ -22,7 +22,7 @@ SHELL = /bin/sh
+ LN = ln -s
+
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -58,7 +58,7 @@ IZ_OUR_BZIP2_DIR = bzip2
+ # LFLAGS1 flags after output file spec, before obj file list
+ # LFLAGS2 flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+
+@@ -199,10 +199,10 @@ flags: unix/configure
+ # Generic targets:
+
+ generic: flags
+- eval $(MAKE) $(MAKEF) zips `cat flags`
++ eval $(MAKE) $(MAKEF) zips `cat flags` CC=$(CC)
+
+ generic_gcc:
+- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
++ $(MAKE) $(MAKEF) generic CPP="gcc -E" CC=$(CC)
+
+ # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
+ att6300nodir:
diff --git a/package/zip/patches/patch-unix_Makefile.orig b/package/zip/patches/patch-unix_Makefile.orig
new file mode 100644
index 000000000..ff185d2d8
--- /dev/null
+++ b/package/zip/patches/patch-unix_Makefile.orig
@@ -0,0 +1,29 @@
+--- zip30.orig/unix/Makefile 2008-05-07 08:33:56.000000000 +0200
++++ zip30/unix/Makefile 2011-10-19 22:20:07.000000000 +0200
+@@ -22,7 +22,7 @@ SHELL = /bin/sh
+ LN = ln -s
+
+ # (to use the GNU compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= cc
+ BIND = $(CC)
+ AS = $(CC) -c
+ CPP = /lib/cpp
+@@ -58,7 +58,7 @@ IZ_OUR_BZIP2_DIR = bzip2
+ # LFLAGS1 flags after output file spec, before obj file list
+ # LFLAGS2 flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+
+@@ -202,7 +202,7 @@ generic: flags
+ eval $(MAKE) $(MAKEF) zips `cat flags`
+
+ generic_gcc:
+- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
++ $(MAKE) $(MAKEF) generic CPP="gcc -E" CC=$(CC)
+
+ # AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
+ att6300nodir: