summaryrefslogtreecommitdiff
path: root/package/zip
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-07-27 10:45:02 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-07-27 10:45:02 +0200
commit42dd254f5937274f164a5a7c5fb3c1f80e38e7af (patch)
tree9d2f1aa0333e04af8493d6a5f533b6e243bf5d2b /package/zip
parent7f0a66667a815bb8e28b4c8b93666b92a667b485 (diff)
full build on Darwin fixes
Diffstat (limited to 'package/zip')
-rw-r--r--package/zip/patches/patch-unix_Makefile.orig29
1 files changed, 0 insertions, 29 deletions
diff --git a/package/zip/patches/patch-unix_Makefile.orig b/package/zip/patches/patch-unix_Makefile.orig
deleted file mode 100644
index ff185d2d8..000000000
--- a/package/zip/patches/patch-unix_Makefile.orig
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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: