Skip to content

Commit adf1d34

Browse files
committed
Updated zlib to 1.2.6.
1 parent 117c47a commit adf1d34

File tree

3 files changed

+30
-38
lines changed

3 files changed

+30
-38
lines changed

patches/zlib-1.2.5-PPU.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

patches/zlib-1.2.6-PPU.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
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
4+
@@ -73,7 +73,7 @@
5+
6+
all: static shared
7+
8+
-static: example$(EXE) minigzip$(EXE)
9+
+static: $(STATICLIB) # example$(EXE) minigzip$(EXE)
10+
11+
shared: examplesh$(EXE) minigzipsh$(EXE)
12+
13+
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 @@
17+
MINGW* | mingw*)
18+
# temporary bypass
19+
rm -f $test.[co] $test $test$shared_ext
20+
- 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
24+
LDSHARED=${LDSHARED-"$cc -shared"}
25+
LDSHAREDLIBC=""
26+
EXE='.exe' ;;
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/sh -e
2-
# zlib-1.2.5.sh by Dan Peori ([email protected])
2+
# zlib-1.2.6.sh by Dan Peori ([email protected])
33

44
## Download the source code.
5-
wget --continue http://zlib.net/zlib-1.2.5.tar.gz
5+
wget --continue http://zlib.net/zlib-1.2.6.tar.gz
66

77
## Unpack the source code.
8-
rm -Rf zlib-1.2.5 && tar xfvz zlib-1.2.5.tar.gz && cd zlib-1.2.5
8+
rm -Rf zlib-1.2.6 && tar xfvz zlib-1.2.6.tar.gz && cd zlib-1.2.6
99

1010
## Patch the source code.
11-
cat ../../patches/zlib-1.2.5-PPU.patch | patch -p1
11+
cat ../../patches/zlib-1.2.6-PPU.patch | patch -p1
1212

1313
## Configure the build.
1414
AR="powerpc64-ps3-elf-ar" CC="powerpc64-ps3-elf-gcc" RANLIB="powerpc64-ps3-elf-ranlib" \

0 commit comments

Comments
 (0)