RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Jul-2007 20:14:24
Branch: HEAD Handle: 2007071719142300
Modified files:
rpm CHANGES configure.ac
rpm/rpmio fts.c
Log:
use just OS as PLATFORM usually means an architecture plus operating
system combination, but this is just an operating system
identification
Summary:
Revision Changes Path
1.1487 +1 -1 rpm/CHANGES
2.199 +3 -3 rpm/configure.ac
1.18 +3 -3 rpm/rpmio/fts.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1486 -r1.1487 CHANGES
--- rpm/CHANGES 17 Jul 2007 14:02:05 -0000 1.1486
+++ rpm/CHANGES 17 Jul 2007 18:14:23 -0000 1.1487
@@ -1,6 +1,6 @@
4.5 -> 5.0:
- rse: add (partially untested) platform support for AIX, IRIX and Tru64
based on OpenPKG patchset.
- - rse: provide an RPM_PLATFORM_XXX define for allowing us to compiler
independent check for a platform in the C code
+ - rse: provide an RPM_OS_XXX define for allowing us to compiler
independent check for a platform in the C code
- rse: move remaining _D_EXACT_NAMLEN fiddling from public rpmio/fts.h
to private rpmio/fts.c
- rse: allow building without POSIX pthreads (explicitly through
--without-pthreads or if platform doesn't support it)
- rse: provide "install-sh" script in %{_rpmhome} as a companion to
"mkinstalldirs"
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.198 -r2.199 configure.ac
--- rpm/configure.ac 17 Jul 2007 17:47:35 -0000 2.198
+++ rpm/configure.ac 17 Jul 2007 18:14:23 -0000 2.199
@@ -96,7 +96,7 @@
dnl # problematic "platform tests". Nevertheless for some extremely
dnl # platform specific parts of the code, we have to know for what
dnl # particular target Unix platform we are building.
-RPM_PLATFORM_NAME=`dnl
+RPM_OS_NAME=`dnl
[echo "$host_os" | \
sed -e 's;^;X;' \
-e 's;^X[^a-zA-Z]*\([a-zA-Z][a-zA-Z/-]*\).*$;\1;' \
@@ -112,10 +112,10 @@
-e 's/^X\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/v1="\1"; v2="\2"/' \
-e 's/^X\([0-9][0-9]*\).*$/v1="\1"/' \
-e 's/^X.*$/:/']`
-RPM_PLATFORM_VERS=`echo . |\
+RPM_OS_VERS=`echo . |\
awk '{ printf("%02d%02d%02d", v1, v2, v3); }' \
v1="$v1" v2="$v2" v3="$v3"`
-CPPFLAGS="$CPPFLAGS -DRPM_PLATFORM_${RPM_PLATFORM_NAME}=${RPM_PLATFORM_VERS}"
+CPPFLAGS="$CPPFLAGS -DRPM_OS_${RPM_OS_NAME}=${RPM_OS_VERS}"
dnl # support static linking of RPM via GNU libtool
LDFLAGS_STATIC=""
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/fts.c
============================================================================
$ cvs diff -u -r1.17 -r1.18 fts.c
--- rpm/rpmio/fts.c 17 Jul 2007 14:02:05 -0000 1.17
+++ rpm/rpmio/fts.c 17 Jul 2007 18:14:23 -0000 1.18
@@ -54,7 +54,7 @@
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
#endif
-#if defined(sun) || defined(RPM_PLATFORM_UNIXWARE)
+#if defined(sun) || defined(RPM_OS_UNIXWARE)
# define __errno_location() (&errno)
# define dirfd(dirp) -1
# define _STAT_VER 0
@@ -83,13 +83,13 @@
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
# define _D_EXACT_NAMLEN(d) ((d)->d_namlen)
#endif
-#if defined(RPM_PLATFORM_IRIX)
+#if defined(RPM_OS_IRIX)
# define __errno_location() (&errno)
# define dirfd(dirp) -1
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
#endif
-#if defined(RPM_PLATFORM_AIX)
+#if defined(RPM_OS_AIX)
# define __errno_location() (&errno)
# define dirfd(dirp) ((dirp)->dd_fd)
# define _STAT_VER 0
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
