Skip to content

Commit f54fc73

Browse files
committed
Fix zlib build error on MacOSX
Thanks to AndoniZubimendi for finding the problem. Also, changed all remaining references to "1.2.6" into "1.2.7"...
1 parent 4c666f5 commit f54fc73

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,13 @@ diff -burN orig.zlib-1.2.6/configure zlib-1.2.6/configure
2424
LDSHARED=${LDSHARED-"$cc -shared"}
2525
LDSHAREDLIBC=""
2626
EXE='.exe' ;;
27+
@@ -231,8 +231,7 @@
28+
SHAREDLIBV=libz.$VER$shared_ext
29+
SHAREDLIBM=libz.$VER1$shared_ext
30+
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
31+
- AR="/usr/bin/libtool"
32+
- ARFLAGS="-o" ;;
33+
+ ;;
34+
*) LDSHARED=${LDSHARED-"$cc -shared"} ;;
35+
esac
36+
else
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/bin/sh -e
2-
# zlib-1.2.6.sh by Dan Peori ([email protected])
2+
# zlib-1.2.7.sh by Dan Peori ([email protected])
33

44
## Download the source code.
55
wget --continue http://zlib.net/zlib-1.2.7.tar.gz
66

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

1010
## Patch the source code.
11-
cat ../../patches/zlib-1.2.6-PPU.patch | patch -p1
11+
cat ../../patches/zlib-1.2.7-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)