Permalink
Browse files

Updated zlib to 1.2.6.

  • Loading branch information...
1 parent 117c47a commit adf1d34312c4ee1692fb6fd442a7332bda885b07 @zeldin zeldin committed Feb 17, 2012
Showing with 30 additions and 38 deletions.
  1. +0 −34 patches/zlib-1.2.5-PPU.patch
  2. +26 −0 patches/zlib-1.2.6-PPU.patch
  3. +4 −4 scripts/{001-zlib-1.2.5.sh → 001-zlib-1.2.6.sh}
@@ -1,34 +0,0 @@
-diff -burN orig.zlib-1.2.5/Makefile.in zlib-1.2.5/Makefile.in
---- orig.zlib-1.2.5/Makefile.in 2010-04-20 00:12:21 -0400
-+++ zlib-1.2.5/Makefile.in 2011-03-06 00:58:14 -0500
-@@ -69,7 +69,7 @@
-
- all: static shared
-
--static: example$(EXE) minigzip$(EXE)
-+static: $(STATICLIB) # example$(EXE) minigzip$(EXE)
-
- shared: examplesh$(EXE) minigzipsh$(EXE)
-
-@@ -168,7 +168,6 @@
- -@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)
- 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 -burN orig.zlib-1.2.5/configure zlib-1.2.5/configure
---- orig.zlib-1.2.5/configure 2010-04-20 00:15:19 -0400
-+++ zlib-1.2.5/configure 2011-03-06 01:11:35 -0500
-@@ -124,8 +124,8 @@
- MINGW*|mingw*)
- # temporary bypass
- rm -f $test.[co] $test $test$shared_ext
-- echo "Please use win32/Makefile.gcc instead."
-- exit 1
-+# echo "Please use win32/Makefile.gcc instead."
-+# exit 1
- LDSHARED=${LDSHARED-"$cc -shared"}
- LDSHAREDLIBC=""
- EXE='.exe' ;;
@@ -0,0 +1,26 @@
+diff -burN orig.zlib-1.2.6/Makefile.in zlib-1.2.6/Makefile.in
+--- orig.zlib-1.2.6/Makefile.in 2012-01-28 23:48:50.000000000 +0100
++++ zlib-1.2.6/Makefile.in 2012-02-17 19:12:07.109166356 +0100
+@@ -73,7 +73,7 @@
+
+ all: static shared
+
+-static: example$(EXE) minigzip$(EXE)
++static: $(STATICLIB) # example$(EXE) minigzip$(EXE)
+
+ shared: examplesh$(EXE) minigzipsh$(EXE)
+
+diff -burN orig.zlib-1.2.6/configure zlib-1.2.6/configure
+--- orig.zlib-1.2.6/configure 2012-01-29 18:48:11.000000000 +0100
++++ zlib-1.2.6/configure 2012-02-17 19:14:34.119121726 +0100
+@@ -182,8 +182,8 @@
+ MINGW* | mingw*)
+ # temporary bypass
+ rm -f $test.[co] $test $test$shared_ext
+- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
+- exit 1
++# echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
++# exit 1
+ LDSHARED=${LDSHARED-"$cc -shared"}
+ LDSHAREDLIBC=""
+ EXE='.exe' ;;
@@ -1,14 +1,14 @@
#!/bin/sh -e
-# zlib-1.2.5.sh by Dan Peori (danpeori@oopo.net)
+# zlib-1.2.6.sh by Dan Peori (danpeori@oopo.net)
## Download the source code.
-wget --continue http://zlib.net/zlib-1.2.5.tar.gz
+wget --continue http://zlib.net/zlib-1.2.6.tar.gz
## Unpack the source code.
-rm -Rf zlib-1.2.5 && tar xfvz zlib-1.2.5.tar.gz && cd zlib-1.2.5
+rm -Rf zlib-1.2.6 && tar xfvz zlib-1.2.6.tar.gz && cd zlib-1.2.6
## Patch the source code.
-cat ../../patches/zlib-1.2.5-PPU.patch | patch -p1
+cat ../../patches/zlib-1.2.6-PPU.patch | patch -p1
## Configure the build.
AR="powerpc64-ps3-elf-ar" CC="powerpc64-ps3-elf-gcc" RANLIB="powerpc64-ps3-elf-ranlib" \

6 comments on commit adf1d34

@kakaroto
Member

Shouldn't we make a copy of the .tar.gz into the repository instead, otherwise it will be a continuous chase over which urls are unavailable. Also, it makes installing the toolchain impossible while being offline.

@zeldin
Member
zeldin commented on adf1d34 Feb 18, 2012

If we do put all the upstreams packages on github (and I'm not saying it's a bad idea), it would probably make sense to put them in a separate repository, and include it as a module. That would make it easier to kill old versions in order to save space.

As for making it possible to build offline, I think that could be achieved simply by skipping the invocation of "wget --continue" when the file already has the correct size. We could create a download script that's a little smarter than just doing wget blindly.

@kakaroto
Member

Yeah, I like the idea of external repo.
But for the skip wget --continue, I disagree that it would make it an "offline installer".. it would just be an "online installer, with a cache".

@zeldin
Member
zeldin commented on adf1d34 Mar 8, 2012

Putting the archives directly in the repo would also make it an "online installer, with a cache". You populate the cache when you clone the repo.

@kakaroto
Member

True and False... needing to 'run the script' at least once to populate the cache makes it an online installer, I mean being able to just clone the repo and have it all for offline compilation is what I mean.
also, if the scripts just use the archives without any wget, then that makes it an offline installer... i.e. no 'download.sh archive.tar.gz', and simply do a 'tar -czvf archive.tar.gz' knowing it is there and valid, etc...
That's the way I'd see an 'offline installer', but anyways all this is irrelevant, it's just about semantics. The important thing is to have those archives backed up somewhere in case the link is down.

@rubio0075

hola porfavor podrias actualizar de version ya que esta version zlib-1.2.6 ya no existe, ahora es nueva version zlib-1.2.7 y no deja terminar el proceso de instalacion.gracias de antemano

Please sign in to comment.