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: 07-Jun-2004 18:30:29
Branch: HEAD Handle: 2004060717302800
Modified files:
openpkg-src/openpkg HISTORY rpmtool
Log:
workaround NetBSD gcc 2.95 optimization problems by not using -O2
there
Summary:
Revision Changes Path
1.191 +1 -0 openpkg-src/openpkg/HISTORY
1.39 +11 -3 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.190 -r1.191 HISTORY
--- openpkg-src/openpkg/HISTORY 7 Jun 2004 15:17:16 -0000 1.190
+++ openpkg-src/openpkg/HISTORY 7 Jun 2004 16:30:28 -0000 1.191
@@ -2,6 +2,7 @@
2004
====
+20040607 workaround NetBSD gcc 2.95 optimization problems by not using -O2 there
20040607 upgrade to latest GNU shtool snapshot to fix platform detection under
NetBSD 1.6.2-STABLE
20040604 revise the stderr processing of run-command processor in case of -d/--debug
20040604 add -k/--keep option to run-command processor for debug purposes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.38 -r1.39 rpmtool
--- openpkg-src/openpkg/rpmtool 15 May 2004 11:23:06 -0000 1.38
+++ openpkg-src/openpkg/rpmtool 7 Jun 2004 16:30:28 -0000 1.39
@@ -364,7 +364,7 @@
fi
fi
;;
- *:FreeBSD:4.*:* )
+ *:FreeBSD:[45].*:* )
n=`/sbin/sysctl hw.ncpu | awk '{ print $2; }'`
if [ ".$n" != . ]; then
if [ $n -gt 1 ]; then
@@ -376,7 +376,7 @@
fi
fi
;;
- *:NetBSD:1.5*:* )
+ *:NetBSD:1.[56]*:* )
n=`/sbin/sysctl hw.ncpu | awk '{ print $3; }'`
if [ ".$n" != . ]; then
if [ $n -gt 1 ]; then
@@ -445,7 +445,15 @@
cflags=''
if [ ".$opt_O" = .yes ]; then
if [ ".$isgcc" = .yes ]; then
- cflags="-O2"
+ case "$platform:`$tool -dumpversion 2>/dev/null`" in
+ *:NetBSD:1.6*:*:2.* )
+ # NetBSD 1.6.x with GCC 2.95.x suffers from memory
+ # exhaustion problems under GCC optimizations.
+ ;;
+ * )
+ cflags="-O2"
+ ;;
+ esac
if [ ".`$tool -v 2>/dev/null | grep 'with-gnu-as'`" != . ] || \
[ ".`(as --version </dev/null) 2>/dev/null | grep 'GNU'`" != .
]; then
cflags="$cflags -pipe"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
