Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: sys-libs/zlib/files/zlib-1.2.3-build.patch

Issue 6776028: Upgrade libxml2 and its portage dependencies (Closed) Base URL: ssh://gitrw.chromium.org:9222/portage-stable.git@master
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 --- zlib-1.2.3/configure
2 +++ zlib-1.2.3/configure
3 @@ -23,7 +23,7 @@
4 VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
5 VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
6 VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
7 -AR=${AR-"ar rc"}
8 +AR=${AR-"ar"}
9 RANLIB=${RANLIB-"ranlib"}
10 prefix=${prefix-/usr/local}
11 exec_prefix=${exec_prefix-'${prefix}'}
12 --- zlib-1.2.3/Makefile.in
13 +++ zlib-1.2.3/Makefile.in
14 @@ -70,7 +70,7 @@
15 fi
16
17 libz.a: $(OBJS) $(OBJA)
18 - $(AR) $@ $(OBJS) $(OBJA)
19 + $(AR) rc $@ $(OBJS) $(OBJA)
20 -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
21
22 match.o: match.S
23 --- zlib-1.2.3/win32/Makefile.gcc
24 +++ zlib-1.2.3/win32/Makefile.gcc
25 @@ -30,21 +30,23 @@
26 #LOC = -DASMV
27 #LOC = -DDEBUG -g
28
29 -CC = gcc
30 -CFLAGS = $(LOC) -O3 -Wall
31 +CC ?= gcc
32 +CFLAGS ?= $(LOC) -O3 -Wall
33
34 -AS = $(CC)
35 -ASFLAGS = $(LOC) -Wall
36 +AS ?= $(CC)
37 +ASFLAGS ?= $(LOC) -Wall
38
39 LD = $(CC)
40 -LDFLAGS = $(LOC) -s
41 +LDFLAGS ?= $(LOC) -s
42
43 -AR = ar
44 +AR ?= ar
45 ARFLAGS = rcs
46
47 -RC = windres
48 +RC ?= windres
49 RCFLAGS = --define GCC_WINDRES
50
51 +DLLWRAP ?= dllwrap
52 +
53 CP = cp -fp
54 # If GNU install is available, replace $(CP) with install.
55 INSTALL = $(CP)
56 @@ -79,9 +81,8 @@
57 $(IMPLIB): $(SHAREDLIB)
58
59 $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
60 - dllwrap --driver-name $(CC) --def win32/zlib.def \
61 + $(DLLWRAP) --driver-name $(CC) --def win32/zlib.def \
62 --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o
63 - strip $@
64
65 example: example.o $(STATICLIB)
66 $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
OLDNEW
« no previous file with comments | « sys-libs/zlib/files/zlib-1.2.3-LDFLAGS.patch ('k') | sys-libs/zlib/files/zlib-1.2.3-mingw-implib.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698