OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Jun-2004 14:06:52
Branch: HEAD Handle: 2004060113064900
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpmrc
Log:
- enable pure-C builds by patching out useless C++ checks from cURL configure
- finally disable ulimits for FreeBSD, Solaris and Linux
- add path defaults for HP/UX, Tru64/OSF1 and UnixWare
- removed OS compatibility mapping list in rpmrc to avoid any magic
Summary:
Revision Changes Path
1.181 +8 -4 openpkg-src/openpkg/HISTORY
1.335 +13 -6 openpkg-src/openpkg/openpkg.spec
1.18 +2 -41 openpkg-src/openpkg/rpmrc
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.180 -r1.181 HISTORY
--- openpkg-src/openpkg/HISTORY 15 May 2004 11:23:06 -0000 1.180
+++ openpkg-src/openpkg/HISTORY 1 Jun 2004 12:06:49 -0000 1.181
@@ -2,10 +2,14 @@
2004
====
-20040415 initial port to Tru64/OSF1 4.0F and IRIX 6.5.21m
-20040412 remove RPM's "lib64" hack to port to NetBSD/sparc64
-20040410 fix GNU tar patch
-20040408 upgraded to GNU shtool 2.0b3
+20040601 enable pure-C builds by patching out useless C++ checks from cURL configure
+20040601 finally disable ulimits for FreeBSD, Solaris and Linux
+20040601 add path defaults for HP/UX, Tru64/OSF1 and UnixWare
+20040601 removed OS compatibility mapping list in rpmrc to avoid any magic
+20040515 initial port to Tru64/OSF1 4.0F and IRIX 6.5.21m
+20040512 remove RPM's "lib64" hack to port to NetBSD/sparc64
+20040510 fix GNU tar patch
+20040508 upgraded to GNU shtool 2.0b3
20040507 **** RELEASE AS PART OF OPENPKG 2.0.3 ***
20040507 synchronize aux.prereq.sh platform checks with official list as of OpenPKG
2.0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.334 -r1.335 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 15 May 2004 16:46:11 -0000 1.334
+++ openpkg-src/openpkg/openpkg.spec 1 Jun 2004 12:06:49 -0000 1.335
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040515
+%define V_openpkg 20040601
# the used software versions
%define V_rpm 4.2.1
@@ -385,24 +385,28 @@
# determine platform-specific build environment
case $plid in
FreeBSD/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
+ NetBSD/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
Linux/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
SunOS/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin:/usr/ccs/bin" ;;
+ UnixWare/*) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin:/usr/ccs/bin" ;;
Darwin/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
+ OSF1/V5.* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
+ HP-UX/* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
* ) l_build_path="/bin:/sbin:/usr/bin:/usr/sbin" ;;
esac
case $plid in
FreeBSD/* ) l_build_ldlp="/usr/lib" ;;
+ NetBSD/* ) l_build_ldlp="/usr/lib" ;;
Linux/* ) l_build_ldlp="/lib:/usr/lib" ;;
SunOS/* ) l_build_ldlp="/usr/lib:/usr/ccs/lib" ;;
+ UnixWare/*) l_build_ldlp="/usr/lib:/usr/ccs/lib" ;;
Darwin/* ) l_build_ldlp="/usr/lib" ;;
+ OSF1/V5.* ) l_build_ldlp="/usr/lib" ;;
+ HP-UX/* ) l_build_ldlp="/usr/lib" ;;
* ) l_build_ldlp="/usr/lib" ;;
esac
case $plid in
- FreeBSD/4* ) l_build_ulim="ulimit -H -S -f 262144 -d 262144 -m 262144 -s
65536 -u 128" ;;
- Linux/2* ) l_build_ulim="ulimit -H -S -f 262144 -d 262144 -m 262144 -v
262144 -s 65536 -u 128" ;;
- SunOS/5.8* ) l_build_ulim="ulimit -H -S -f 262144 -d 262144 -s 65536" ;;
- Darwin/* ) l_build_ulim=":" ;;
- * ) l_build_ulim=":" ;;
+ * ) l_build_ulim=":" ;;
esac
echo "l_build_path=\"$l_build_path\"; export l_build_path" >>.buildenv
echo "l_build_ldlp=\"$l_build_ldlp\"; export l_build_ldlp" >>.buildenv
@@ -608,6 +612,9 @@
# build cURL tool
( cd curl-%{V_curl}
+ %{l_prefix}/lib/openpkg/shtool subst \
+ -e '/LINENO: error: C\+\+ preprocessor/{N;N;N;N;s/.*/:/;}' \
+ configure
( echo 'ac_cv_header_openssl_engine_h=no'
echo 'lt_cv_prog_compiler_c_o_F77=no'
echo 'lt_cv_sys_max_cmd_len=100'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmrc
============================================================================
$ cvs diff -u -r1.17 -r1.18 rpmrc
--- openpkg-src/openpkg/rpmrc 23 Jan 2004 12:46:08 -0000 1.17
+++ openpkg-src/openpkg/rpmrc 1 Jun 2004 12:06:49 -0000 1.18
@@ -36,6 +36,7 @@
#
# CPU Architecture Mappings
+# (most important architectures only)
#
# Intel IA32/IA64
@@ -66,46 +67,6 @@
#
# Operating System Mappings
+# (currently intentionally left out to avoid any magic)
#
-# FreeBSD
-os_compat: freebsd4.0: freebsd4.0 anyos
-os_compat: freebsd4.1: freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.2: freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.3: freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.4: freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1
freebsd4.0 anyos
-os_compat: freebsd4.5: freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2
freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.6: freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3
freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.7: freebsd4.7 freebsd4.6 freebsd4.5 freebsd4.4
freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.8: freebsd4.8 freebsd4.7 freebsd4.6 freebsd4.5
freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd4.9: freebsd4.9 freebsd4.8 freebsd4.7 freebsd4.6
freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 anyos
-os_compat: freebsd5.0: freebsd5.0 anyos
-os_compat: freebsd5.1: freebsd5.1 freebsd5.0 anyos
-os_compat: freebsd5.2: freebsd5.2 freebsd5.1 freebsd5.0 anyos
-os_compat: freebsd5.3: freebsd5.3 freebsd5.2 freebsd5.1 freebsd5.0 anyos
-
-# GNU/Linux
-os_compat: redhat7.0: redhat7.0 anyos
-os_compat: redhat7.1: redhat7.1 redhat7.0 anyos
-os_compat: redhat7.2: redhat7.2 redhat7.1 redhat7.0 anyos
-os_compat: redhat7.3: redhat7.3 redhat7.2 redhat7.1 redhat7.0 anyos
-os_compat: redhat8.0: redhat8.0 redhat7.3 redhat7.2 redhat7.1 redhat7.0
anyos
-os_compat: redhat8.1: redhat8.1 redhat8.0 redhat7.3 redhat7.2 redhat7.1
redhat7.0 anyos
-os_compat: redhat8.2: redhat8.2 redhat8.1 redhat8.0 redhat7.3 redhat7.2
redhat7.1 redhat7.0 anyos
-os_compat: redhat9: redhat9 redhat8.2 redhat8.1 redhat8.0 redhat7.3
redhat7.2 redhat7.1 redhat7.0 anyos
-os_compat: suse8.0: suse8.0 anyos
-os_compat: suse8.1: suse8.1 suse8.0 anyos
-os_compat: suse8.2: suse8.2 suse8.1 suse8.0 anyos
-
-# Sun Solaris
-os_compat: solaris2.0: solaris2.0 anyos
-os_compat: solaris2.1: solaris2.1 solaris2.0 anyos
-os_compat: solaris2.2: solaris2.2 solaris2.1 solaris2.0 anyos
-os_compat: solaris2.3: solaris2.3 solaris2.2 solaris2.1 solaris2.0 anyos
-os_compat: solaris2.4: solaris2.4 solaris2.3 solaris2.2 solaris2.1
solaris2.0 anyos
-os_compat: solaris2.5: solaris2.5 solaris2.4 solaris2.3 solaris2.2
solaris2.1 solaris2.0 anyos
-os_compat: solaris2.6: solaris2.6 solaris2.5 solaris2.4 solaris2.3
solaris2.2 solaris2.1 solaris2.0 anyos
-os_compat: solaris7: solaris7 solaris2.6 solaris2.5 solaris2.4
solaris2.3 solaris2.2 solaris2.1 solaris2.0 anyos
-os_compat: solaris8: solaris8 solaris7 solaris2.6 solaris2.5
solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0 anyos
-os_compat: solaris9: solaris9 solaris8 solaris7 solaris2.6
solaris2.5 solaris2.4 solaris2.3 solaris2.2 solaris2.1 solaris2.0 anyos
-
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
