diff --git a/archiver/zlib/zlib.conf b/archiver/zlib/zlib.conf index bdc2d5b0f..2127ab0bc 100644 --- a/archiver/zlib/zlib.conf +++ b/archiver/zlib/zlib.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../zlib/zlib.conf -# Copyright (C) 2008 - 2011 The OpenSDE Project +# Copyright (C) 2008 - 2012 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -29,11 +29,5 @@ if [ "$SDECFG_STATIC" = "0" ] ; then hook_add postmake 3 "zlib_pm" fi -# 'AR=ar rc' is hardcoded in the Makefile but while cross-compiling we -# override it by passing "AR=$arch_target-ar" as makeopt -if atstage cross; then - var_append AR " " "rc" -fi - var_append makeinstopt " " "prefix=/$prefix" var_append makeinstopt " " "mandir=$mandir" diff --git a/archiver/zlib/zlib.desc b/archiver/zlib/zlib.desc index 4cd174277..072bc1698 100644 --- a/archiver/zlib/zlib.desc +++ b/archiver/zlib/zlib.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../zlib/zlib.desc -[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -37,8 +37,8 @@ [L] OpenSource [S] Stable -[V] 1.2.5 +[V] 1.2.7 [P] X -?-3-----9 105.900 -[D] 2570509682 zlib-1.2.5.tar.bz2 http://www.zlib.net/ +[D] 989677682 zlib-1.2.7.tar.bz2 http://www.zlib.net/