On Nov 4, 2010, at 10:28 AM, devzero2000 wrote: > On Thu, Nov 4, 2010 at 3:22 PM, Jeff Johnson <n3...@mac.com> wrote: > BTW, there's a modest fix in rpm-5.3 & HEAD to get > rid of the pesky uuid_t typedef in <unistd.h> on Mac Os X. > > Wasn't hard, just annoying. > > Dunno whether I pushed the fix (I've forgotten) to rpm-5_2. > > Perhaps this ?
Bingo! 73 de Jeff > > git show 42d055608cb44f303f1bafb958bb379717b > commit 42d055608cb44f303f1bafb958bb379717b8ace7 > Author: afb <afb> > Date: Tue Apr 21 08:01:53 2009 +0000 > > workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h" > > diff --git a/rpmio/rpmjs.c b/rpmio/rpmjs.c > index 13ac730..65742c8 100644 > --- a/rpmio/rpmjs.c > +++ b/rpmio/rpmjs.c > @@ -1,3 +1,12 @@ > +#if defined(__APPLE__) > +/* workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h" */ > +#define _UUID_T > +#define uuid_t __darwin_uuid_t > +#include <unistd.h> > +#undef uuid_t > +#undef _UUID_T > +#endif > + > #include "system.h" > > > git describe --tags 42d055608cb44f303f1bafb958bb379717b > rpm-5.2a4-release-42-g42d0556 > > > > 73 de Jeff > > > On Nov 4, 2010, at 8:17 AM, Anders F. Björklund wrote: > > > RPM Package Manager, CVS Repository > > http://rpm5.org/cvs/ > > > > ____________________________________________________________________________ > > > > Server: rpm5.org Name: Anders F. Björklund > > Root: /v/rpm/cvs Email: a...@rpm5.org > > Module: rpm Date: 04-Nov-2010 13:17:53 > > Branch: rpm-5_2 Handle: 2010110412175200 > > > > Modified files: (Branch: rpm-5_2) > > rpm devtool.conf > > > > Log: > > devtool: make sure to include uuid for %macosx > > > > Summary: > > Revision Changes Path > > 2.293.2.24 +1 -1 rpm/devtool.conf > > > > ____________________________________________________________________________ > > > > patch -p0 <<'@@ .' > > Index: rpm/devtool.conf > > > > ============================================================================ > > $ cvs diff -u -r2.293.2.23 -r2.293.2.24 devtool.conf > > --- rpm/devtool.conf 4 Nov 2010 11:56:15 -0000 2.293.2.23 > > +++ rpm/devtool.conf 4 Nov 2010 12:17:52 -0000 2.293.2.24 > > @@ -1878,7 +1878,7 @@ > > make -C perl CC="$UNIVERSAL_CC" > > MACOSX_DEPLOYMENT_TARGET="$MACOSX_DEPLOYMENT_TARGET" OTHERLDFLAGS="$LDFLAGS" > > > > # python complains about missing symbols from all over when using > > librpm*, relink: > > - make -C misc LIBS="-lz -lxml2 -lpcre $LIBS" clean all > > + make -C misc LIBS="-lz -lxml2 -lpcre -luuid $LIBS" clean all > > make -C rpmio LIBS="-lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 > > $LIBS" clean all > > > > # install into a temporary destroot, instead of to system > > @@ . > > ______________________________________________________________________ > > RPM Package Manager http://rpm5.org > > CVS Sources Repository rpm-...@rpm5.org > > ______________________________________________________________________ > RPM Package Manager http://rpm5.org > Developer Communication List rpm-devel@rpm5.org >
