Skip to content

Commit 1c342e3

Browse files
committed
Merge pull request #30 from leonn/master
fix #25 patch update zlib-1.2.8
2 parents 60d4b7e + d5180fd commit 1c342e3

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

patches/zlib-1.2.8-PPU.patch

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
diff -burN orig.zlib-1.2.6/Makefile.in zlib-1.2.6/Makefile.in
2-
--- orig.zlib-1.2.6/Makefile.in 2012-01-28 23:48:50.000000000 +0100
3-
+++ zlib-1.2.6/Makefile.in 2012-02-17 19:12:07.109166356 +0100
2+
--- orig.zlib-1.2.6/Makefile.in 2012-01-28 23:48:50.000000000 +0100
3+
+++ zlib-1.2.6/Makefile.in 2012-02-17 19:12:07.109166356 +0100
44
@@ -73,7 +73,7 @@
55

66
all: static shared
@@ -11,26 +11,30 @@ diff -burN orig.zlib-1.2.6/Makefile.in zlib-1.2.6/Makefile.in
1111
shared: examplesh$(EXE) minigzipsh$(EXE)
1212

1313
diff -burN orig.zlib-1.2.6/configure zlib-1.2.6/configure
14-
--- orig.zlib-1.2.6/configure 2012-01-29 18:48:11.000000000 +0100
15-
+++ zlib-1.2.6/configure 2012-02-17 19:14:34.119121726 +0100
16-
@@ -182,8 +182,8 @@
14+
--- orig.zlib-1.2.6/configure 2012-01-29 18:48:11.000000000 +0100
15+
+++ zlib-1.2.6/configure 2012-02-17 19:14:34.119121726 +0100
16+
@@ -193,8 +193,8 @@
1717
MINGW* | mingw*)
1818
# temporary bypass
1919
rm -f $test.[co] $test $test$shared_ext
2020
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
21-
- exit 1
22-
+# echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
23-
+# exit 1
21+
- leave 1
22+
+ # echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
23+
+ # leave 1
2424
LDSHARED=${LDSHARED-"$cc -shared"}
2525
LDSHAREDLIBC=""
2626
EXE='.exe' ;;
27-
@@ -231,8 +231,7 @@
27+
@@ -217,12 +217,7 @@
2828
SHAREDLIBV=libz.$VER$shared_ext
2929
SHAREDLIBM=libz.$VER1$shared_ext
3030
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
31-
- AR="/usr/bin/libtool"
31+
- if libtool -V 2>&1 | grep Apple > /dev/null; then
32+
- AR="libtool"
33+
- else
34+
- AR="/usr/bin/libtool"
35+
- fi
3236
- ARFLAGS="-o" ;;
33-
+ ;;
37+
+ ;;
3438
*) LDSHARED=${LDSHARED-"$cc -shared"} ;;
3539
esac
3640
else

0 commit comments

Comments
 (0)