d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade package zlib

This commit is contained in:
Volker Grabsch 2010-04-20 17:49:41 +02:00
parent e484f1bd92
commit fd43231faf
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/zlib-win32-static.patch Normal file
View File

@ -0,0 +1,28 @@
diff -r 5a13d390f989 Makefile.in
--- a/Makefile.in Tue Apr 20 14:59:46 2010 +0200
+++ b/Makefile.in Tue Apr 20 17:46:22 2010 +0200
@@ -167,8 +167,8 @@
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
- cp $(STATICLIB) $(DESTDIR)$(libdir)
- cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ [ -z '$(STATICLIB)' ] || cp $(STATICLIB) $(DESTDIR)$(libdir)
+ [ -z '$(SHAREDLIBV)' ] || cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
diff -r 5a13d390f989 configure
--- a/configure Tue Apr 20 14:59:46 2010 +0200
+++ b/configure Tue Apr 20 17:46:22 2010 +0200
@@ -122,10 +122,7 @@
CYGWIN* | Cygwin* | cygwin* | OS/2*)
EXE='.exe' ;;
MINGW*|mingw*)
-# temporary bypass
rm -f $test.[co] $test $test$shared_ext
- echo "Please use win32/Makefile.gcc instead."
- exit 1
LDSHARED=${LDSHARED-"$cc -shared"}
LDSHAREDLIBC=""
EXE='.exe' ;;

6
src/zlib.mk
View File

@ -4,8 +4,8 @@
# zlib
PKG := zlib
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.2.4
$(PKG)_CHECKSUM := 8cf10521c1927daa5e12efc5e1725a0d70e579f3
$(PKG)_VERSION := 1.2.5
$(PKG)_CHECKSUM := 543fa9abff0442edca308772d6cef85557677e02
$(PKG)_SUBDIR := zlib-$($(PKG)_VERSION)
$(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.bz2
$(PKG)_WEBSITE := http://zlib.net/
@ -19,7 +19,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && CC='$(TARGET)-gcc' AR='$(TARGET)-ar' RANLIB='$(TARGET)-ranlib' ./configure \
cd '$(1)' && CHOST='$(TARGET)' ./configure \
--prefix='$(PREFIX)/$(TARGET)' \
--static
$(MAKE) -C '$(1)' -j '$(JOBS)' install