| 1 |
vapier 08/05/02 04:13:34 |
| 2 |
|
| 3 |
Added: zlib-1.2.3-build.patch |
| 4 |
Log: |
| 5 |
Fixes from kerzol for mingw targets #182903. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-libs/zlib/files/zlib-1.2.3-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.3-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/zlib/files/zlib-1.2.3-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: zlib-1.2.3-build.patch |
| 15 |
=================================================================== |
| 16 |
--- zlib-1.2.3/configure |
| 17 |
+++ zlib-1.2.3/configure |
| 18 |
@@ -23,7 +23,7 @@ |
| 19 |
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` |
| 20 |
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` |
| 21 |
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` |
| 22 |
-AR=${AR-"ar rc"} |
| 23 |
+AR=${AR-"ar"} |
| 24 |
RANLIB=${RANLIB-"ranlib"} |
| 25 |
prefix=${prefix-/usr/local} |
| 26 |
exec_prefix=${exec_prefix-'${prefix}'} |
| 27 |
--- zlib-1.2.3/Makefile.in |
| 28 |
+++ zlib-1.2.3/Makefile.in |
| 29 |
@@ -70,7 +70,7 @@ |
| 30 |
fi |
| 31 |
|
| 32 |
libz.a: $(OBJS) $(OBJA) |
| 33 |
- $(AR) $@ $(OBJS) $(OBJA) |
| 34 |
+ $(AR) rc $@ $(OBJS) $(OBJA) |
| 35 |
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1 |
| 36 |
|
| 37 |
match.o: match.S |
| 38 |
--- zlib-1.2.3/win32/Makefile.gcc |
| 39 |
+++ zlib-1.2.3/win32/Makefile.gcc |
| 40 |
@@ -30,21 +30,23 @@ |
| 41 |
#LOC = -DASMV |
| 42 |
#LOC = -DDEBUG -g |
| 43 |
|
| 44 |
-CC = gcc |
| 45 |
-CFLAGS = $(LOC) -O3 -Wall |
| 46 |
+CC ?= gcc |
| 47 |
+CFLAGS ?= $(LOC) -O3 -Wall |
| 48 |
|
| 49 |
-AS = $(CC) |
| 50 |
-ASFLAGS = $(LOC) -Wall |
| 51 |
+AS ?= $(CC) |
| 52 |
+ASFLAGS ?= $(LOC) -Wall |
| 53 |
|
| 54 |
LD = $(CC) |
| 55 |
-LDFLAGS = $(LOC) -s |
| 56 |
+LDFLAGS ?= $(LOC) -s |
| 57 |
|
| 58 |
-AR = ar |
| 59 |
+AR ?= ar |
| 60 |
ARFLAGS = rcs |
| 61 |
|
| 62 |
-RC = windres |
| 63 |
+RC ?= windres |
| 64 |
RCFLAGS = --define GCC_WINDRES |
| 65 |
|
| 66 |
+DLLWRAP ?= dllwrap |
| 67 |
+ |
| 68 |
CP = cp -fp |
| 69 |
# If GNU install is available, replace $(CP) with install. |
| 70 |
INSTALL = $(CP) |
| 71 |
@@ -79,9 +81,8 @@ |
| 72 |
$(IMPLIB): $(SHAREDLIB) |
| 73 |
|
| 74 |
$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o |
| 75 |
- dllwrap --driver-name $(CC) --def win32/zlib.def \ |
| 76 |
+ $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \ |
| 77 |
--implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o |
| 78 |
- strip $@ |
| 79 |
|
| 80 |
example: example.o $(STATICLIB) |
| 81 |
$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB) |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
-- |
| 86 |
gentoo-commits@l.g.o mailing list |
Archives