zip/cflags.patch at main · clearlinux-pkgs/zip · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
--- zip30/unix/Makefile~	2008-05-07 02:33:56.000000000 -0400
+++ zip30/unix/Makefile	2015-03-09 00:39:13.339345383 -0400
@@ -57,8 +57,8 @@
 #   CFLAGS    flags for C compile
 #   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_NOOPT += -I. -DUNIX $(LOCAL_ZIP)
+CFLAGS += -O2 $(CFLAGS_NOOPT)
 LFLAGS1 =
 LFLAGS2 = -s

--- zip30/unix/configure~	2008-06-19 23:32:20.000000000 -0400
+++ zip30/unix/configure	2015-07-08 15:49:13.478378115 -0400
@@ -17,7 +17,7 @@
 trap "rm -f conftest* core a.out; exit 1" 1 2 3 15

 CC=${1-cc}
-CFLAGS=${2-"-I. -DUNIX"}
+CFLAGS+=${2-"-I. -DUNIX"} $(CFLAGS)
 LFLAGS1=''
 LFLAGS2=''
 LN="ln -s"
--- zip30/unix/Makefile~	2015-03-09 00:39:13.000000000 -0400
+++ zip30/unix/Makefile	2015-07-08 15:54:29.333429384 -0400
@@ -23,7 +23,7 @@

 # (to use the GNU compiler, change cc to gcc in CC)
 CC = cc
-BIND = $(CC)
+BIND = $(CC) $(LDFLAGS)
 AS = $(CC) -c
 CPP = /lib/cpp
 E =
--- zip30/unix/Makefile~	2015-07-08 15:54:29.000000000 -0400
+++ zip30/unix/Makefile	2015-07-08 15:56:45.602725783 -0400
@@ -59,7 +59,7 @@
 #   LFLAGS2   flags after obj file list (libraries, etc)
 CFLAGS_NOOPT += -I. -DUNIX $(LOCAL_ZIP)
 CFLAGS += -O2 $(CFLAGS_NOOPT)
-LFLAGS1 =
+LFLAGS1 = $(LDFLAGS)
 LFLAGS2 = -s

 # object file lists