From 43389106203dc93c1f39fbe3c549d25dd8b92d38 Mon Sep 17 00:00:00 2001 From: Aldas Nabazas Date: Mon, 3 Aug 2009 13:53:47 +0300 Subject: [PATCH] zip: enabled in stage1 (needed for gcc) --- archiver/zip/zip.conf | 9 ++++++--- archiver/zip/zip.desc | 6 ++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/archiver/zip/zip.conf b/archiver/zip/zip.conf index 3b4ad1d2b..dec145f6f 100644 --- a/archiver/zip/zip.conf +++ b/archiver/zip/zip.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../zip/zip.conf -# Copyright (C) 2007 The OpenSDE Project +# Copyright (C) 2007 - 2009 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,6 +13,9 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -var_insert makeopt ' ' '-f unix/Makefile prefix=$root/$prefix generic' -var_insert makeinstopt ' ' '-f unix/Makefile prefix=$root/$prefix INSTALL=install' +var_append makeopt ' ' '-f unix/Makefile prefix=/$prefix generic' +var_append makeinstopt ' ' '-f unix/Makefile prefix=$root/$prefix INSTALL=install' + +var_remove_regex makeopt ' ' "AS=.*" +var_remove_regex makeinstopt ' ' "AS=.*" diff --git a/archiver/zip/zip.desc b/archiver/zip/zip.desc index b4faa3612..58b38f0be 100644 --- a/archiver/zip/zip.desc +++ b/archiver/zip/zip.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../zip/zip.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -31,7 +30,6 @@ [L] OpenSource [S] Stable [V] 232 -[P] X -----5---9 110.700 +[P] X -1---5---9 110.700 [D] 57677441 zip232.tar.gz ftp://ftp.info-zip.org/pub/infozip/src/ -