OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 30-Oct-2003 14:40:53
Branch: HEAD Handle: 2003103013405201
Modified files:
openpkg-src/infozip infozip.patch infozip.spec
openpkg-web news.txt
Log:
Do not depend anymore on the native CPP and use the OpenPKG GCC
package's CPP instead
Summary:
Revision Changes Path
1.4 +19 -0 openpkg-src/infozip/infozip.patch
1.30 +6 -3 openpkg-src/infozip/infozip.spec
1.7226 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/infozip/infozip.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 infozip.patch
--- openpkg-src/infozip/infozip.patch 10 Jul 2003 09:54:30 -0000 1.3
+++ openpkg-src/infozip/infozip.patch 30 Oct 2003 13:40:53 -0000 1.4
@@ -1,5 +1,24 @@
--- zip-2.3/unix/configure 1999-04-27 21:49:05.000000000 +0200
+++ zip-2.3/unix/configure 2003-03-06 21:46:09.399540000 +0100
+@@ -17,15 +17,9 @@
+ LN="ln -s"
+
+ echo Check for the C preprocessor
+-# on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+-CPP="${CC} -E"
+-# solaris as(1) needs -P, maybe others as well ?
+-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+-[ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+-[ -f /xenix ] && CPP="${CC} -E"
+-[ -f /lynx.os ] && CPP="${CC} -E"
++# use the OpenPKG GCC cpp binary unconditionally,
++# because on some platforms, the native one is broken
++CPP="@l_cpp@"
+
+ echo Check if we can use asm code
+ OBJA=""
@@ -38,7 +38,7 @@
echo "int foo() { return 0;}" > conftest.c
$CC -c conftest.c >/dev/null 2>/dev/null
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/infozip/infozip.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 infozip.spec
--- openpkg-src/infozip/infozip.spec 18 Sep 2003 15:38:16 -0000 1.29
+++ openpkg-src/infozip/infozip.spec 30 Oct 2003 13:40:53 -0000 1.30
@@ -38,8 +38,8 @@
Distribution: OpenPKG [BASE]
Group: Archiver
License: BSD
-Version: 20030918
-Release: 20030918
+Version: 20031030
+Release: 20031030
# list of sources
Source0: ftp://ftp.info-zip.org/pub/infozip/src/zip%{V_zip_real}.tar.gz
@@ -49,7 +49,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030909
+BuildPreReq: OpenPKG, openpkg >= 20030909, gcc
PreReq: OpenPKG, openpkg >= 20030909
AutoReq: no
AutoReqProv: no
@@ -63,6 +63,9 @@
%setup0 -q -c
%setup1 -q -T -D -a 1
%patch0 -p0
+ %{l_shtool} subst \
+ -e 's;@l_cpp@;%{l_cc} -E;' \
+ zip-%{V_zip_here}/unix/configure
%build
( cd zip-%{V_zip_here}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7225 -r1.7226 news.txt
--- openpkg-web/news.txt 30 Oct 2003 11:12:23 -0000 1.7225
+++ openpkg-web/news.txt 30 Oct 2003 13:40:52 -0000 1.7226
@@ -1,3 +1,4 @@
+30-Oct-2003: Upgraded package: P<infozip-20031030-20031030>
30-Oct-2003: Upgraded package: P<mutt-1.4.1i-20031030>
30-Oct-2003: Upgraded package: P<postgresql-7.3.1-1.2.3>
30-Oct-2003: Upgraded package: P<delegate-8.7.6-20031030>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
