RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 02-Jul-2013 21:55:07 Branch: rpm-5_4 Handle: 2013070219550600 Modified files: (Branch: rpm-5_4) rpm CHANGES configure.ac Log: - fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef Summary: Revision Changes Path 1.3501.2.318+1 -0 rpm/CHANGES 2.472.2.74 +4 -2 rpm/configure.ac ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.317 -r1.3501.2.318 CHANGES --- rpm/CHANGES 2 Jul 2013 02:22:22 -0000 1.3501.2.317 +++ rpm/CHANGES 2 Jul 2013 19:55:06 -0000 1.3501.2.318 @@ -1,4 +1,5 @@ 5.4.10 -> 5.4.11: + - jbj: fix: rescusitate --with-uuid with pesky Mac OS X uuid_t typedef - jbj: preliminaries for db-6.0.19 uplift. - jbj: lua: fix: drop portability cruft to avoid lua panic.. - jbj: blake: update to final NIST submission. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.472.2.73 -r2.472.2.74 configure.ac --- rpm/configure.ac 27 Jun 2013 12:40:11 -0000 2.472.2.73 +++ rpm/configure.ac 2 Jul 2013 19:55:06 -0000 2.472.2.74 @@ -1926,7 +1926,7 @@ esac RPM_CHECK_LIB( [OSSP uuid], [uuid], - [ossp-uuid uuid], [uuid_import], [uuid.h], + [uuid ossp-uuid], [uuid_import], [uuid.h], [no,external:none], [], [ dnl # enable OSSP uuid native API support for embedded Lua if test ".$WITH_LUA" = .yes; then @@ -1935,7 +1935,9 @@ ], []) case "$host" in *-*-darwin* ) -mv confdefs.h-SAVE confdefs.h;; +grep 'define HAVE_UNISTD_H' confdefs.h-SAVE >> confdefs.h +rm -f confdefs.h-SAVE +;; esac dnl # Syck @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
