RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 22-Sep-2010 22:27:32
Branch: rpm-5_3 Handle: 2010092220273101
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac system.h
Log:
- macosx: avoid <unistd.h> uuid_t typedef, permit --with-uuid.
- macosx: add -fnested-functions (when available).
Summary:
Revision Changes Path
1.3296.2.79 +2 -0 rpm/CHANGES
2.432.2.19 +5 -1 rpm/configure.ac
2.128.2.1 +2 -0 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.78 -r1.3296.2.79 CHANGES
--- rpm/CHANGES 21 Sep 2010 22:08:47 -0000 1.3296.2.78
+++ rpm/CHANGES 22 Sep 2010 20:27:31 -0000 1.3296.2.79
@@ -1,4 +1,6 @@
5.3.3 -> 5.3.4:
+ - jbj: macosx: avoid <unistd.h> uuid_t typedef, permit --with-uuid.
+ - jbj: macosx: add -fnested-functions (when available).
- jbj: i18n: update po files (Translation Project).
- jbj: ruby: stick with ruby-1.8.6 (1.9.2p0 needs work).
- jbj: yarn: add yarnLaunchStack() to create a yarnThread with a stack.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.432.2.18 -r2.432.2.19 configure.ac
--- rpm/configure.ac 21 Sep 2010 15:54:12 -0000 2.432.2.18
+++ rpm/configure.ac 22 Sep 2010 20:27:32 -0000 2.432.2.19
@@ -188,7 +188,7 @@
dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/
if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then
dnl # GNU GCC (usually "gcc")
- for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions
+ for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions -fnested-functions
do
my_save_cflags="$CFLAGS"
CFLAGS=$c
@@ -1678,6 +1678,9 @@
fi
dnl # OSSP uuid
+dnl XXX hack-o-round typedef __darwin_uuid_t uuid_t; in Mac OS X <unistd.h>
+mv confdefs.h confdefs.h-SAVE
+grep -v 'define HAVE_UNISTD_H' confdefs.h-SAVE > confdefs.h
RPM_CHECK_LIB(
[OSSP uuid], [uuid],
[ossp-uuid uuid], [uuid_import], [uuid.h],
@@ -1687,6 +1690,7 @@
WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID"
fi
], [])
+mv confdefs.h-SAVE confdefs.h
dnl # Syck
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.128 -r2.128.2.1 system.h
--- rpm/system.h 21 Mar 2010 00:34:58 -0000 2.128
+++ rpm/system.h 22 Sep 2010 20:27:32 -0000 2.128.2.1
@@ -61,7 +61,9 @@
/* <unistd.h> should be included before any preprocessor test
of _POSIX_VERSION. */
#ifdef HAVE_UNISTD_H
+#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */
#include <unistd.h>
+#undef unistd_uuid_t /* XXX Mac OS X dares to be different. */
#if defined(__LCLINT__)
/*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing */
extern int chroot (const char *__path)
@@ .
Received on Wed Sep 22 22:27:32 2010