Skip to content

Commit 8ac2936

Browse files
niXmanniXman
committed
zlib-1.2.11 patch added & scripts for building gcc-6-branch and gcc-7-branch added
1 parent 4fd31f8 commit 8ac2936

File tree

4 files changed

+555
-3
lines changed

4 files changed

+555
-3
lines changed

‎patches/zlib/01-zlib-1.2.11-1-buildsys.mingw.patch

+258
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,258 @@
1+
--- zlib-1.2.11/configure.orig 2016-12-31 21:06:40.000000000 +0300
2+
+++ zlib-1.2.11/configure 2017-01-17 08:32:52.101363500 +0300
3+
@@ -38,6 +38,7 @@
4+
5+
# destination name for static library
6+
STATICLIB=libz.a
7+
+IMPORTLIB=
8+
9+
# extract zlib version numbers from zlib.h
10+
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
11+
@@ -74,7 +75,7 @@
12+
prefix=${prefix-/usr/local}
13+
exec_prefix=${exec_prefix-'${prefix}'}
14+
libdir=${libdir-'${exec_prefix}/lib'}
15+
-sharedlibdir=${sharedlibdir-'${libdir}'}
16+
+sharedlibdir=${sharedlibdir-'${exec_prefix}/bin'}
17+
includedir=${includedir-'${prefix}/include'}
18+
mandir=${mandir-'${prefix}/share/man'}
19+
shared_ext='.so'
20+
@@ -89,6 +90,7 @@
21+
debug=0
22+
old_cc="$CC"
23+
old_cflags="$CFLAGS"
24+
+old_ldflags="$LDFLAGS"
25+
OBJC='$(OBJZ) $(OBJG)'
26+
PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
27+
28+
@@ -213,14 +215,24 @@
29+
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
30+
LDCONFIG="ldconfig -m" ;;
31+
CYGWIN* | Cygwin* | cygwin* | OS/2*)
32+
+ CFLAGS="${CFLAGS} -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64"
33+
+ SFLAGS="${CFLAGS}"
34+
+ LDFLAGS="-L. ${old_ldflags}"
35+
+ shared_ext=".dll"
36+
+ SHAREDLIB='cygz.dll'
37+
+ IMPORTLIB='libz.dll.a'
38+
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-export-all -Wl,--enable-auto-image-base -Wl,--out-implib=${IMPORTLIB}"}
39+
+ LDSHAREDLIBC=''
40+
EXE='.exe' ;;
41+
MINGW* | mingw*)
42+
# temporary bypass
43+
- rm -f $test.[co] $test $test$shared_ext
44+
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
45+
- leave 1
46+
- LDSHARED=${LDSHARED-"$cc -shared"}
47+
- LDSHAREDLIBC=""
48+
+ SFLAGS="${CFLAGS}"
49+
+ LDFLAGS="-L. ${old_ldflags}"
50+
+ shared_ext=".dll"
51+
+ SHAREDLIB='zlib1.dll'
52+
+ IMPORTLIB='libz.dll.a'
53+
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-export-all -Wl,--enable-auto-image-base -Wl,--out-implib=${IMPORTLIB}"}
54+
+ LDSHAREDLIBC=''
55+
EXE='.exe' ;;
56+
QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
57+
# ([email protected])
58+
@@ -344,11 +356,32 @@
59+
esac
60+
fi
61+
62+
+case "$uname" in
63+
+ *CYGWIN* | *Cygwin* | *cygwin* )
64+
+ # On cygwin, we always build both shared and static libs
65+
+ ALL="static shared"
66+
+ SHAREDLIBPOST='/bin/true'
67+
+ SHAREDTARGET=${SHAREDLIB}
68+
+ TEST="all teststatic testshared"
69+
+ ;;
70+
+ *MINGW* | *Mingw* | *mingw* )
71+
+ # On Mingw, we always build both shared and static libs
72+
+ ALL="static shared"
73+
+ SHAREDLIBPOST='/bin/true'
74+
+ SHAREDTARGET=${SHAREDLIB}
75+
+ TEST="all teststatic testshared"
76+
+ ;;
77+
+ *)
78+
+
79+
# destination names for shared library if not defined above
80+
SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
81+
SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
82+
SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
83+
-
84+
+SHAREDLIBPOST='(rm -f $(SHAREDLIB) $(SHAREDLIBM); ln -s $@ $(SHAREDLIB) ; ln -s $@ $(SHAREDLIBM) )'
85+
+SHAREDTARGET='$(SHAREDLIBV)'
86+
+ ;;
87+
+esac
88+
+
89+
echo >> configure.log
90+
91+
# define functions for testing compiler and library characteristics and logging the results
92+
@@ -847,6 +880,9 @@
93+
echo SHAREDLIBM = $SHAREDLIBM >> configure.log
94+
echo SHAREDLIBV = $SHAREDLIBV >> configure.log
95+
echo STATICLIB = $STATICLIB >> configure.log
96+
+echo IMPORTLIB = $IMPORTLIB >> configure.log
97+
+echo SHAREDLIBPOST = $SHAREDLIBPOST >> configure.log
98+
+echo SHAREDTARGET = $SHAREDTARGET >> configure.log
99+
echo TEST = $TEST >> configure.log
100+
echo VER = $VER >> configure.log
101+
echo Z_U4 = $Z_U4 >> configure.log
102+
@@ -868,9 +904,12 @@
103+
/^LDSHARED *=/s#=.*#=$LDSHARED#
104+
/^CPP *=/s#=.*#=$CPP#
105+
/^STATICLIB *=/s#=.*#=$STATICLIB#
106+
+/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
107+
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
108+
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
109+
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
110+
+/^SHAREDLIBPOST *=/s#=.*#=$SHAREDLIBPOST#
111+
+/^SHAREDTARGET *=/s#=.*#=$SHAREDTARGET#
112+
/^AR *=/s#=.*#=$AR#
113+
/^ARFLAGS *=/s#=.*#=$ARFLAGS#
114+
/^RANLIB *=/s#=.*#=$RANLIB#
115+
@@ -899,9 +938,12 @@
116+
/^CPP *=/s#=.*#=$CPP#
117+
/^LDSHARED *=/s#=.*#=$LDSHARED#
118+
/^STATICLIB *=/s#=.*#=$STATICLIB#
119+
+/^IMPORTLIB *=/s#=.*#=$IMPORTLIB#
120+
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
121+
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
122+
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
123+
+/^SHAREDLIBPOST *=/s#=.*#=$SHAREDLIBPOST#
124+
+/^SHAREDTARGET *=/s#=.*#=$SHAREDTARGET#
125+
/^AR *=/s#=.*#=$AR#
126+
/^ARFLAGS *=/s#=.*#=$ARFLAGS#
127+
/^RANLIB *=/s#=.*#=$RANLIB#
128+
--- zlib-1.2.11/Makefile.in.orig 2017-01-15 20:29:40.000000000 +0300
129+
+++ zlib-1.2.11/Makefile.in 2017-01-17 08:53:10.064299400 +0300
130+
@@ -34,6 +34,9 @@
131+
SHAREDLIB=libz.so
132+
SHAREDLIBV=libz.so.1.2.11
133+
SHAREDLIBM=libz.so.1
134+
+IMPORTLIB=
135+
+SHAREDLIBPOST='(rm -f $(SHAREDLIB) $(SHAREDLIBM); ln -s $@ $(SHAREDLIB) ; ln -s $@ $(SHAREDLIBM) )'
136+
+SHAREDTARGET=$(SHAREDLIBV)
137+
LIBS=$(STATICLIB) $(SHAREDLIBV)
138+
139+
AR=ar
140+
@@ -48,7 +51,7 @@
141+
prefix = /usr/local
142+
exec_prefix = ${prefix}
143+
libdir = ${exec_prefix}/lib
144+
-sharedlibdir = ${libdir}
145+
+sharedlibdir = ${exec_prefix}/bin
146+
includedir = ${prefix}/include
147+
mandir = ${prefix}/share/man
148+
man3dir = ${mandir}/man3
149+
@@ -127,7 +130,7 @@
150+
./infcover
151+
gcov inf*.c
152+
153+
-libz.a: $(OBJS)
154+
+$(STATICLIB): $(OBJS)
155+
$(AR) $(ARFLAGS) $@ $(OBJS)
156+
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
157+
158+
@@ -278,11 +281,9 @@
159+
-@mv objs/gzwrite.o $@
160+
161+
162+
-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
163+
+placebo $(SHAREDTARGET): $(PIC_OBJS) $(STATICLIB)
164+
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
165+
- rm -f $(SHAREDLIB) $(SHAREDLIBM)
166+
- ln -s $@ $(SHAREDLIB)
167+
- ln -s $@ $(SHAREDLIBM)
168+
+ $(SHAREDLIBPOST)
169+
-@rmdir objs
170+
171+
example$(EXE): example.o $(STATICLIB)
172+
@@ -292,11 +292,11 @@
173+
minigzip$(EXE): minigzip.o $(STATICLIB)
174+
$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
175+
176+
-examplesh$(EXE): example.o $(SHAREDLIBV)
177+
- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
178+
+examplesh$(EXE): example.o $(SHAREDTARGET)
179+
+ $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDTARGET)
180+
181+
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
182+
- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
183+
+minigzipsh$(EXE): minigzip.o $(SHAREDTARGET)
184+
+ $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDTARGET)
185+
186+
example64$(EXE): example64.o $(STATICLIB)
187+
$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
188+
@@ -309,20 +310,34 @@
189+
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
190+
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
191+
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
192+
- rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
193+
cp $(STATICLIB) $(DESTDIR)$(libdir)
194+
- chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
195+
- -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
196+
- -@if test -n "$(SHAREDLIBV)"; then \
197+
- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
198+
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
199+
- echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
200+
- chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
201+
- echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
202+
- rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
203+
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
204+
- ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
205+
- ($(LDCONFIG) || true) >/dev/null 2>&1; \
206+
+ -@(chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB))
207+
+ -@($(RANLIB) $(DESTDIR)$(libdir)/$(STATICLIB) || true) >/dev/null 2>&1
208+
+ -@if test -n "$(IMPORTLIB)" ; then \
209+
+ cp $(IMPORTLIB) $(DESTDIR)$(libdir); \
210+
+ echo "cp $(IMPORTLIB) $(DESTDIR)$(libdir)"; \
211+
+ chmod 644 $(DESTDIR)$(libdir)/$(IMPORTLIB); \
212+
+ if test -n "$(SHAREDTARGET)" ; then \
213+
+ if test -f "$(SHAREDTARGET)" ; then \
214+
+ cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir); \
215+
+ echo "cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir)"; \
216+
+ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET); \
217+
+ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)"; \
218+
+ fi; \
219+
+ fi; \
220+
+ if test -n "$(SHAREDLIBV)"; then \
221+
+ if test -f "$(SHAREDLIBV)"; then \
222+
+ rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
223+
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
224+
+ ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
225+
+ ($(LDCONFIG) || true) >/dev/null 2>&1; \
226+
+ fi; \
227+
+ fi; \
228+
+ else \
229+
+ cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir); \
230+
+ echo "cp $(SHAREDTARGET) $(DESTDIR)$(sharedlibdir)"; \
231+
+ chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET); \
232+
+ echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDTARGET)"; \
233+
fi
234+
rm -f $(DESTDIR)$(man3dir)/zlib.3
235+
cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
236+
@@ -341,12 +356,13 @@
237+
238+
uninstall:
239+
cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
240+
- cd $(DESTDIR)$(libdir) && rm -f libz.a; \
241+
+ cd $(DESTDIR)$(libdir) && rm -f $(STATCILIB) $(IMPORTLIB); \
242+
if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
243+
rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
244+
fi
245+
cd $(DESTDIR)$(man3dir) && rm -f zlib.3
246+
cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
247+
+ cd $(DESTDIR)$(sharedlibdir) && (rm -f $(SHAREDTARGET) || true) > /dev/null 2>&1
248+
249+
docs: zlib.3.pdf
250+
251+
@@ -369,6 +385,7 @@
252+
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
253+
example64$(EXE) minigzip64$(EXE) \
254+
infcover \
255+
+ $(STATICLIB) $(IMPORTLIB) $(SHAREDTARGET) $(SHAREDLIBV) $(SHAREDLIBV) $(SHAREDLIBM) \
256+
libz.* foo.gz so_locations \
257+
_match.s maketree contrib/infback9/*.o
258+
rm -rf objs

‎scripts/gcc-5-branch.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535

3636
# **************************************************************************
3737

38-
PKG_NAME=gcc-5-branch
39-
PKG_DIR_NAME=gcc-5-branch
38+
PKG_VERSION=5-branch
39+
PKG_NAME=gcc-${PKG_VERSION}
40+
PKG_DIR_NAME=gcc-${PKG_VERSION}
4041
PKG_TYPE=svn
4142
PKG_URLS=(
42-
"svn://gcc.gnu.org/svn/gcc/branches/gcc-5-branch|repo:$PKG_TYPE"
43+
"svn://gcc.gnu.org/svn/gcc/branches/${PKG_NAME}|repo:$PKG_TYPE"
4344
)
4445

4546
PKG_PRIORITY=main

0 commit comments

Comments
 (0)