2010-05-04 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Tue, 4 May 2010 16:33:23 +0000 (16:33 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 4 May 2010 16:33:23 +0000 (16:33 +0000)
* packages/packages.current: Update zlib to 1.2.5, now directly as
source package from zlib.net.
* configure.ac: Make zlib a source package.
* src/Makefile.am (gpg4win_mpkgs): Add zlib.
(gpg4win_bpkgs): Remove zlib.
(gpg4win_pkg_zlib_post_install): Bump version and fix install path.
(gpg4win_pkg_zlib_make_args, gpg4win_pkg_zlib_make_args_inst): New.
* src/gpg4win.mk.in (MPKG_template_): Run post install hook and
fix clean target.

ChangeLog
configure.ac
packages/packages.current
src/Makefile.am
src/gpg4win.mk.in

index d29d935..21ba7f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-04  Marcus Brinkmann  <marcus@g10code.de>
+
+       * packages/packages.current: Update zlib to 1.2.5, now directly as
+       source package from zlib.net.
+       * configure.ac: Make zlib a source package.
+       * src/Makefile.am (gpg4win_mpkgs): Add zlib.
+       (gpg4win_bpkgs): Remove zlib.
+       (gpg4win_pkg_zlib_post_install): Bump version and fix install path.
+       (gpg4win_pkg_zlib_make_args, gpg4win_pkg_zlib_make_args_inst): New.
+       * src/gpg4win.mk.in (MPKG_template_): Run post install hook and
+       fix clean target.
+
 2010-05-04  Colin Leroy  <colin@colino.net
 
        * packages/packages.current: Update Claws-Mail and plugins
index 7a89dcf..7f5ce08 100644 (file)
@@ -195,7 +195,7 @@ gpg4win_dup_sources=""
 GPG4WIN_BPKG_GNU([libiconv])
 GPG4WIN_BPKG_GNU([gettext], [libiconv])
 
-GPG4WIN_BPKG_GNUWIN32([zlib])
+GPG4WIN_SPKG([zlib])
 GPG4WIN_BPKG_GNUWIN32_LIB([crypt])
 GPG4WIN_BPKG_GNUWIN32([regex])
 GPG4WIN_BPKG_GNUWIN32([jpeg])
index 93c6cb0..e85e55c 100644 (file)
@@ -28,17 +28,16 @@ file libiconv/libiconv-1.9.1.tar.gz
 chk  f130c93fdf20903ca21bace8b8822f46468c9d65
 
 
+server http://zlib.net
+
+file zlib-1.2.5.tar.gz
+chk  8e8b93fa5eb80df1afe5422309dca42964562d7e
+
+
 # Gnuwin32 packages orginally hosted at sf.net but mirrored at g10code
 # for easier download.
 server ftp://ftp.g10code.com/mirrors/gnuwin32
 
-file zlib-1.2.3-bin.zip
-chk  becbcaf5076e307e743b1edc6a5645849eba9ebc
-file zlib-1.2.3-lib.zip
-chk  fe2ee77293da3361b1f2710d1bd62f27b2ae64b0
-file zlib-1.2.3-src.zip
-chk  0e18fcd7f1a585f825c210a1bb2456b4aa8fcc0d
-
 # file libpng-1.2.8-bin.zip
 # chk  32876271847afed0ed721fb1b5913a2ce5f25168
 # file libpng-1.2.8-lib.zip
index 255d5eb..a92030c 100644 (file)
@@ -289,10 +289,10 @@ gpg4win_pkg_scute_configure = --silent \
 gpg4win_pkg_paperkey_configure = --silent
 
 # Supported make-only source packages.
-gpg4win_mpkgs = pthreads-w32 bzip2
+gpg4win_mpkgs = pthreads-w32 bzip2 zlib
 
 # Extra options for the make invocations for individual packages.
-# make_flags is used fur building, make_args_inst is used for installing.
+# make_flags is used for building, make_args_inst is used for installing.
 gpg4win_pkg_pthreads_w32_make_args = \
   prefix=$(idir) CROSS=$(host_alias)- clean GC-inlined
 
@@ -305,9 +305,14 @@ gpg4win_pkg_bzip2_make_args = \
 gpg4win_pkg_bzip2_make_args_inst = \
   PREFIX=$$$${pkgidir} CC=$(CC) AR=$(AR) RANLIB=$(RANLIB)
 
+gpg4win_pkg_zlib_make_args = -fwin32/Makefile.gcc PREFIX=i586-mingw32msvc- IMPLIB=libz.dll.a
+
+gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
+       BINARY_PATH=$$$${pkgidir}/bin INCLUDE_PATH=$$$${pkgidir}/include \
+       LIBRARY_PATH=$$$${pkgidir}/lib SHARED_MODE=1 IMPLIB=libz.dll.a
 
 # Supported binary packages.
-gpg4win_bpkgs = libiconv gettext pkgconfig zlib libpng jpeg pango cairo \
+gpg4win_bpkgs = libiconv gettext pkgconfig libpng jpeg pango cairo \
                atk gtk+ gpgee crypt regex qt kdesupport oxygen-icons kdelibs \
                kleopatra bsfilter
 
@@ -332,14 +337,14 @@ endef
 
 # Zlib needs some special magic to generate a libtool file.
 define gpg4win_pkg_zlib_post_install
-(cd $$$${pkgidir_dev};                                 \
-echo "dlname='../bin/zlib1.dll'" > lib/libz.la;        \
+(cd $$$${pkgidir};                                     \
+echo "dlname='../bin/zlib1.dll'" > lib/libz.la;                \
 echo "library_names='libz.dll.a'" >> lib/libz.la;      \
 echo "old_library='libz.a'" >> lib/libz.la;            \
 echo "dependency_libs=''" >> lib/libz.la;              \
 echo "current=1" >> lib/libz.la;                       \
 echo "age=2" >> lib/libz.la;                           \
-echo "revision=3" >> lib/libz.la;                      \
+echo "revision=5" >> lib/libz.la;                      \
 echo "installed=yes" >> lib/libz.la;                   \
 echo "shouldnotlink=no" >> lib/libz.la;                        \
 echo "dlopen=''" >> lib/libz.la;                       \
index 9e20bf9..ce0a1d5 100644 (file)
@@ -213,7 +213,8 @@ stamps/stamp-$(1)-04-install: stamps/stamp-$(1)-03-make
        ($(call SETVARS,$(1));                          \
          cd "$$$${pkgsdir}";                           \
          $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs_inst} install; \
-         $(call STRIP_macro,"$$$${pkgidir}"))
+         $(call STRIP_macro,"$$$${pkgidir}"); \
+         $(call gpg4win_pkg_$(call FROB_macro,$(1))_post_install))
        touch stamps/stamp-$(1)-04-install
 
 stamps/stamp-$(1)-05-stow: stamps/stamp-$(1)-04-install
@@ -231,7 +232,7 @@ clean-$(1):
         (cd $(ipdir) &&                                \
          ($(STOW) -D "$$$${pkg_version}";              \
           rm -fR "$$$${pkg_version}"));                \
-        rm -fR "$$$${pkgsdir}"
+        rm -fR "$$$${pkgsdir}")
        rm -f stamps/stamp-final-$(1) stamps/stamp-$(1)-*
 
 endef