diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-21 09:28:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-21 09:28:42 +0200 |
| commit | bfb5b3012282088e30059d86d0f9699ad39ecbed (patch) | |
| tree | c12a9713afd70022f556860e90bccfe806a1389d /package/zip/patches/patch-unix_Makefile | |
| parent | 021237fba314dadb8f861a5ca5d45e327bcdd154 (diff) | |
| parent | 81a2930edf98d2a8c451009149b70ac5ad1f16aa (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/zip/patches/patch-unix_Makefile')
| -rw-r--r-- | package/zip/patches/patch-unix_Makefile | 33 |
1 files changed, 33 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: |