1 |
vapier 07/12/02 19:52:07 |
2 |
|
3 |
Added: zip-2.32-build.patch digest-zip-2.32-r1 |
4 |
Log: |
5 |
Cleanup the build system yet again #200995. |
6 |
(Portage version: 2.1.4_rc4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 app-arch/zip/files/zip-2.32-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-2.32-build.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/zip-2.32-build.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: zip-2.32-build.patch |
15 |
=================================================================== |
16 |
respect build environment settings |
17 |
|
18 |
--- zip/unix/Makefile |
19 |
+++ zip/unix/Makefile |
20 |
@@ -12,15 +12,15 @@ |
21 |
|
22 |
list: all |
23 |
|
24 |
-MAKE = make -f unix/Makefile |
25 |
+MAKE := $(MAKE) -f unix/Makefile |
26 |
SHELL = /bin/sh |
27 |
LN = ln -s |
28 |
|
29 |
# (to use the Gnu compiler, change cc to gcc in CC) |
30 |
-CC = cc |
31 |
+CC ?= gcc |
32 |
BIND = $(CC) |
33 |
AS = $(CC) -c |
34 |
-CPP = /lib/cpp |
35 |
+CPP ?= $(CC) |
36 |
EXE = |
37 |
|
38 |
# probably can change this to 'install' if you have it |
39 |
@@ -47,7 +47,7 @@ |
40 |
# LFLAGS1 flags after output file spec, before obj file list |
41 |
# LFLAGS2 flags after obj file list (libraries, etc) |
42 |
CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP) |
43 |
-CFLAGS = -O2 $(CFLAGS_NOOPT) |
44 |
+CFLAGS ?= -O2 $(CFLAGS_NOOPT) |
45 |
LFLAGS1 = |
46 |
LFLAGS2 = -s |
47 |
|
48 |
--- zip/unix/configure |
49 |
+++ zip/unix/configure |
50 |
@@ -13,52 +13,13 @@ |
51 |
|
52 |
CC=${1-cc} |
53 |
-CFLAGS=${2-"-I. -DUNIX"} |
54 |
-LFLAGS1="" |
55 |
+CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}" |
56 |
+LFLAGS1="${LDFLAGS}" |
57 |
LN="ln -s" |
58 |
-echo "Check C compiler type (optimization option)" |
59 |
-cat > conftest.c << _EOF_ |
60 |
-int main() |
61 |
-{ |
62 |
-#ifndef __SUNPRO_C |
63 |
- bad code |
64 |
-#endif |
65 |
- return 0; |
66 |
-} |
67 |
-_EOF_ |
68 |
-$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null |
69 |
-if test $? -eq 0; then |
70 |
- echo ' Sun C (-xO3)' |
71 |
- CFLAGS="${CFLAGS} -xO3" |
72 |
-else |
73 |
- cat > conftest.c << _EOF_ |
74 |
-int main() |
75 |
-{ |
76 |
-#ifndef __DECC |
77 |
- bad code |
78 |
-#endif |
79 |
- return 0; |
80 |
-} |
81 |
-_EOF_ |
82 |
- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null |
83 |
- if test $? -eq 0; then |
84 |
- echo ' DEC C (-O3)' |
85 |
- CFLAGS="${CFLAGS} -O3" |
86 |
- else |
87 |
- echo ' Other (gcc?) (-O2)' |
88 |
- CFLAGS="${CFLAGS} -O2" |
89 |
- fi |
90 |
-fi |
91 |
|
92 |
echo Check for the C preprocessor |
93 |
# on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. |
94 |
CPP="${CC} -E" |
95 |
# solaris as(1) needs -P, maybe others as well ? |
96 |
-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" |
97 |
-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp |
98 |
-[ -f /lib/cpp ] && CPP=/lib/cpp |
99 |
-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp |
100 |
-[ -f /xenix ] && CPP="${CC} -E" |
101 |
-[ -f /lynx.os ] && CPP="${CC} -E" |
102 |
|
103 |
echo "#include <stdio.h>" > conftest.c |
104 |
$CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E" |
105 |
|
106 |
|
107 |
|
108 |
1.1 app-arch/zip/files/digest-zip-2.32-r1 |
109 |
|
110 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/digest-zip-2.32-r1?rev=1.1&view=markup |
111 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-arch/zip/files/digest-zip-2.32-r1?rev=1.1&content-type=text/plain |
112 |
|
113 |
Index: digest-zip-2.32-r1 |
114 |
=================================================================== |
115 |
MD5 8a4da4460386e324debe97f3b7fe4d96 zip232.tar.gz 807180 |
116 |
RMD160 6b9326c8a60bc6bf08825e416140fd0ca8a6a7f1 zip232.tar.gz 807180 |
117 |
SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f zip232.tar.gz 807180 |
118 |
|
119 |
|
120 |
|
121 |
-- |
122 |
gentoo-commits@g.o mailing list |