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: 28-Oct-2003 10:37:34
Branch: HEAD Handle: 2003102809373400
Modified files:
openpkg-src/openpkg HISTORY platform rpmtool
Log:
upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10
support; read from /dev/null on 'as --version' to circumvent
brain-dead GNU as 1.x on OpenDarwin
Summary:
Revision Changes Path
1.81 +1 -0 openpkg-src/openpkg/HISTORY
1.11 +36 -11 openpkg-src/openpkg/platform
1.24 +1 -1 openpkg-src/openpkg/rpmtool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.80 -r1.81 HISTORY
--- openpkg-src/openpkg/HISTORY 27 Oct 2003 20:18:44 -0000 1.80
+++ openpkg-src/openpkg/HISTORY 28 Oct 2003 09:37:34 -0000 1.81
@@ -2,6 +2,7 @@
2003
====
+20031028 upgrade to latest OSSP platform script for Darwin 6.6 and Solaris 10
support
20031027 port RPM to OpenDarwin 6.6.2
20031027 try to cleanup glob(3) replacement hacks in RPM
20031021 fix RPM GCC building on Unixware by using Linux i386 assembly specific
stuff on Linux only.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/platform
============================================================================
$ cvs diff -u -r1.10 -r1.11 platform
--- openpkg-src/openpkg/platform 29 Sep 2003 13:04:17 -0000 1.10
+++ openpkg-src/openpkg/platform 28 Oct 2003 09:37:34 -0000 1.11
@@ -231,7 +231,7 @@
;;
web )
# non-whitespace HTTP Server-header id
- opt_F="%<ap>-%<sp>"
+ opt_F="%<sp>-%<ap>"
opt_S="/"
opt_C="+"
;;
@@ -383,6 +383,9 @@
*:Linux:* )
# determine architecture
AT="${UNAME_MACHINE}"
+ case "${AT}" in
+ x86_64 ) AT='AMD64' ;;
+ esac
AP="${AT}"
case "${AP}" in
i[3-6]86 ) AP='iX86' ;;
@@ -409,7 +412,7 @@
[ ".${tagfile}" = .x ] && continue
[ ! -f "/etc/${tagfile}" ] && continue
n=`echo ${tagfile} | sed -e 's/[_-]release$//' -e
's/[_-]version$//'`
- v=`cat /etc/${tagfile} | grep '[0-9]' | head -1 |\
+ v=`(grep VERSION /etc/${tagfile}; cat /etc/${tagfile}) | grep
'[0-9]' | head -1 |\
sed -e 's/^/#/' \
-e
's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
-e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
@@ -439,7 +442,7 @@
# determine architecture
AT="${UNAME_MACHINE}"
case "${AT}" in
- i86pc ) AT="iX86" ;;
+ i86pc ) AT="iX86" ;;
esac
AP="${AT}"
case "${AP}" in
@@ -455,7 +458,7 @@
ST="[Sun ]SunOS ${UNAME_RELEASE}"
v=`echo "${UNAME_RELEASE}" |\
sed -e 's;^4\.;1.;' \
- -e 's;^5\.\([0-6]\).*;2.\1;' \
+ -e 's;^5\.\([0-6]\)[^0-9]*$;2.\1;' \
-e 's;^5\.\([0-9][0-9]*\).*;\1;'`
SP="[Sun ]Solaris $v"
case "${UNAME_RELEASE}" in
@@ -469,7 +472,7 @@
# determine architecture
AT="${UNAME_MACHINE}"
case "${AT}" in
- i[3-6]86 | ix86at ) AT="iX86" ;;
+ i[3-6]86 | ix86at ) AT="iX86" ;;
esac
AP="${AT}"
# determine system
@@ -484,7 +487,7 @@
# determine architecture
AT="${UNAME_MACHINE}"
case "${AT}" in
- x86pc ) AT="iX86" ;;
+ x86pc ) AT="iX86" ;;
esac
AP="${AT}"
# determine system
@@ -501,8 +504,8 @@
AT="${UNAME_MACHINE}"
AP="${AT}"
case "${AP}:${UNAME_SYSTEM}" in
- IP*:IRIX64 ) AP="MIPS64" ;;
- IP*:* ) AP="MIPS" ;;
+ IP*:IRIX64 ) AP="MIPS64" ;;
+ IP*:* ) AP="MIPS" ;;
esac
AC="${AP}"
# determine system
@@ -520,7 +523,7 @@
case "${AT}" in
ia64 ) AT="IA64" ;;
9000/[34]?? ) AT=M68K ;;
- 9000/[678][0-9][0-9])
+ 9000/[678][0-9][0-9])
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
@@ -581,6 +584,22 @@
esac
;;
+ # Apple MacOS X Darwin
+ *:Darwin:* )
+ AT=`uname -p`
+ case "${AT}" in
+ powerpc ) AT="PPC" ;;
+ esac
+ AP="${AT}"
+ AC="${AP}"
+ case "${AC}" in
+ i?86 ) AC="iX86" ;;
+ esac
+ ST="[Apple ]${UNAME_SYSTEM} ${UNAME_RELEASE}"
+ SP="${ST}"
+ SC="4.4BSD${opt_C}Mach3"
+ ;;
+
# TODO ...ADD YOUR NEW PLATFORM CHECK HERE... TODO
# *:XXX:* )
# ...
@@ -588,10 +607,16 @@
# ...A STILL UNKNOWN PLATFORM...
* )
- AT="${UNAME_MACHINE}"
+ AT=`echo "${UNAME_MACHINE}" | sed -e "s; ;${opt_C};g"`
AP="${AT}"
AC="${AP}"
- ST="${UNAME_SYSTEM} ${UNAME_RELEASE}"
+ v=`echo "${UNAME_RELEASE}" |\
+ sed -e 's/^/#/' \
+ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+ -e 's/^#[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/' \
+ -e 's/^#[^0-9]*\([0-9][0-9]*\).*$/\1/' \
+ -e 's/^#.*$/?/'`
+ ST="${UNAME_SYSTEM} ${v}"
SP="${ST}"
SC="${SP}"
;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmtool
============================================================================
$ cvs diff -u -r1.23 -r1.24 rpmtool
--- openpkg-src/openpkg/rpmtool 19 Oct 2003 19:00:46 -0000 1.23
+++ openpkg-src/openpkg/rpmtool 28 Oct 2003 09:37:34 -0000 1.24
@@ -433,7 +433,7 @@
if [ ".$isgcc" = .yes ]; then
cflags="-O2"
if [ ".`$tool -v 2>/dev/null | grep 'with-gnu-as'`" != . ] || \
- [ ".`(as --version) 2>/dev/null | grep 'GNU'`" != . ]; then
+ [ ".`(as --version </dev/null) 2>/dev/null | grep 'GNU'`" != .
]; then
cflags="$cflags -pipe"
fi
else
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
