date:20100320

[CVS] RPM: rpm/build/ spec.c

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   20-Mar-2010 17:40:15
  Branch: HEAD Handle: 2010032016401500

  Modified files:
rpm/build   spec.c

  Log:
- spec: oops, remove debugging spewage.

  Summary:
RevisionChanges Path
2.210   +0  -1  rpm/build/spec.c
  

  patch -p0 '@@ .'
  Index: rpm/build/spec.c
  
  $ cvs diff -u -r2.209 -r2.210 spec.c
  --- rpm/build/spec.c  19 Mar 2010 16:40:32 -  2.209
  +++ rpm/build/spec.c  20 Mar 2010 16:40:15 -  2.210
  @@ -402,7 +402,6 @@
   
num = strtoul(fieldp, end, 10);
SKIPSPACE(end);
  -fprintf(stderr, num(%u) = strtoul(\%s\, \...%s\, 10)\n, num, fieldp, 
end);
if (*end != ':') {
rpmlog(RPMLOG_ERR, _(line %d: No ':' terminator: %s\n),
 spec-lineNum, spec-line);
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ configure.ac

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:09:12
  Branch: HEAD Handle: 2010032100091200

  Modified files:
rpm configure.ac

  Log:
- nix: wire up AutoFu for libATerm.a (retrofitted into
nix-0.15-1.src.rpm).

  Summary:
RevisionChanges Path
2.432   +7  -0  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.431 -r2.432 configure.ac
  --- rpm/configure.ac  19 Mar 2010 20:03:30 -  2.431
  +++ rpm/configure.ac  21 Mar 2010 00:09:12 -  2.432
  @@ -1486,6 +1486,13 @@
 fi
   ], [])
   
  +dnl # ATerm (needed by Nix)
  +RPM_CHECK_LIB(
  +[ATerm], [aterm],
  +[ATerm], [ATinit], [aterm1.h],
  +[no,external:none], [],
  +[
  +], [])
   dnl # Nix
   dnl # XXX the tests are mostly pointless, all bow to the AutoFu!
   AC_LANG_PUSH(C++)
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ Makefile.am

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:10:03
  Branch: HEAD Handle: 2010032100100300

  Modified files:
rpm/rpmio   Makefile.am

  Log:
- nix: stub-in proof-of-concept target to link against Nix libraries.

  Summary:
RevisionChanges Path
1.265   +22 -1  rpm/rpmio/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/Makefile.am
  
  $ cvs diff -u -r1.264 -r1.265 Makefile.am
  --- rpm/rpmio/Makefile.am 10 Jan 2010 00:31:20 -  1.264
  +++ rpm/rpmio/Makefile.am 21 Mar 2010 00:10:03 -  1.265
  @@ -19,7 +19,7 @@
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmtar rpmz \
tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
  - tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3
  + tnix tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3
   
   bin_PROGRAMS =
   man_MANS =
  @@ -342,6 +342,27 @@
   tmire_SOURCES = tmire.c
   tmire_LDADD = $(RPMIO_LDADD_COMMON)
   
  +#libtool: link: g++
  +#-I../../externals/inst-aterm/include -I./..
  +#-I./../libutil -I./../libstore -I./../libexpr -I./../libmain
  +#-I../libexpr
  +#-O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
  +#-o .libs/nix-instantiate nix-instantiate.o
  +#../libmain/.libs/libmain.so
  +#../libexpr/.libs/libexpr.so
  +#/X/nix/nix-0.15/src/libstore/.libs/libstore.so
  +#../libstore/.libs/libstore.so
  +#/X/nix/nix-0.15/src/libutil/.libs/libutil.so
  +#../libutil/.libs/libutil.so
  +#/X/nix/nix-0.15/src/boost/format/.libs/libformat.so
  +#../boost/format/.libs/libformat.so
  +#-L/X/nix/nix-0.15/externals/inst-aterm/lib 
/X/nix/nix-0.15/externals/inst-aterm/lib/libATerm.a
  +#-lpthread -Wl,-rpath -Wl,/usr/lib/nix
  +tnix_SOURCES = tnix.cc
  +tnix_LDADD = -L/usr/lib/nix -lmain -lexpr -lstore -lutil -lformat \
  + /usr/lib/nix/libATerm.a
  +tnix_LDFLAGS =   -Wl,-rpath -Wl,/usr/lib/nix
  +
   tperl_SOURCES = tperl.c
   tperl_LDADD = $(RPMIO_LDADD_COMMON)
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ librpmio.vers

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:11:25
  Branch: HEAD Handle: 2010032100112500

  Modified files:
rpm/rpmio   librpmio.vers

  Log:
- rpmio: add the new urlType getter to loader maps.

  Summary:
RevisionChanges Path
2.155   +1  -0  rpm/rpmio/librpmio.vers
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/librpmio.vers
  
  $ cvs diff -u -r2.154 -r2.155 librpmio.vers
  --- rpm/rpmio/librpmio.vers   8 Mar 2010 22:18:38 -   2.154
  +++ rpm/rpmio/librpmio.vers   21 Mar 2010 00:11:25 -  2.155
  @@ -631,6 +631,7 @@
   urlSetCallback;
   urlSplit;
   urlStrerror;
  +urlType;
   Utime;
   _Utime;
   Utimes;
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ mire.c

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:12:45
  Branch: HEAD Handle: 2010032100124500

  Modified files:
rpm/rpmio   mire.c

  Log:
- mire: make sure the value of pattern match is displayed iff
--miredbug.

  Summary:
RevisionChanges Path
1.56+3  -1  rpm/rpmio/mire.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/mire.c
  
  $ cvs diff -u -r1.55 -r1.56 mire.c
  --- rpm/rpmio/mire.c  4 Mar 2010 20:55:32 -   1.55
  +++ rpm/rpmio/mire.c  21 Mar 2010 00:12:45 -  1.56
  @@ -417,7 +417,9 @@
t[vallen] = '\0';
val = t;
}
  - }
  + } else
  + if (vallen == 0)
  + vallen = strlen(val);
   /*...@-nullpass@*/
/* XXX HACK: PCRE returns 2/3 of array, POSIX dimensions regmatch_t. */
rc = regexec(mire-preg, val,
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/lib/ rpmfc.c

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:15:18
  Branch: HEAD Handle: 2010032100151600

  Modified files:
rpm/lib rpmfc.c

  Log:
- rpmfc: eliminate -vv spewage, use --miredebug is/when needed.
- rpmfc: fix: don't add literal macro pattern filters if not defined.

  Summary:
RevisionChanges Path
1.73+24 -11 rpm/lib/rpmfc.c
  

  patch -p0 '@@ .'
  Index: rpm/lib/rpmfc.c
  
  $ cvs diff -u -r1.72 -r1.73 rpmfc.c
  --- rpm/lib/rpmfc.c   6 Mar 2010 15:31:29 -   1.72
  +++ rpm/lib/rpmfc.c   21 Mar 2010 00:15:16 -  1.73
  @@ -340,12 +340,14 @@
   int i;
   
   s = rpmExpand(str, NULL);
  -if (s) {
  +if (s  *s) {
xx = poptParseArgvString(s, ac, (const char ***)av);
s = _free(s);
   }
  -if (ac == 0 || av == NULL || *av == NULL)
  +if (ac == 0 || av == NULL || *av == NULL) {
  + s = _free(s);
goto exit;
  +}
   
   for (i = 0; i  ac; i++) {
xx = mireAppend(RPMMIRE_REGEX, 0, av[i], NULL, mire, nmire);
  @@ -377,7 +379,9 @@
   int i;
   
   for (i = 0; i  nmire; i++) {
  +#ifdef   DYING   /* XXX noisy. use --miredebug if you need this spewage 
*/
rpmlog(RPMLOG_DEBUG, D_(Checking %c: '%s'\n), deptype, str);
  +#endif
if ((xx = mireRegexec(mire + i, str, 0))  0)
continue;
rpmlog(RPMLOG_NOTICE, _(Skipping %c: '%s'\n), deptype, str);
  @@ -981,17 +985,26 @@
   int j;
   
   if (_filter_execs) {
  - fc-Pnmire = 0;
fc-PFnmire = 0;
  - fc-Rnmire = 0;
  + fc-PFmires = rpmfcExpandRegexps(%{?__noautoprovfiles}, fc-PFnmire);
  + if (fc-PFnmire  0)
  + rpmlog(RPMLOG_DEBUG, D_(added %d %%__noautoprovfiles patterns.\n),
  + fc-PFnmire);
fc-RFnmire = 0;
  -
  - fc-PFmires = rpmfcExpandRegexps(%{__noautoprovfiles}, fc-PFnmire);
  - fc-RFmires = rpmfcExpandRegexps(%{__noautoreqfiles}, fc-RFnmire);
  - fc-Pmires = rpmfcExpandRegexps(%{__noautoprov}, fc-Pnmire);
  - fc-Rmires = rpmfcExpandRegexps(%{__noautoreq}, fc-Rnmire);
  - rpmlog(RPMLOG_DEBUG, D_(%i _noautoprov patterns.\n), fc-Pnmire);
  - rpmlog(RPMLOG_DEBUG, D_(%i _noautoreq patterns.\n), fc-Rnmire);
  + fc-RFmires = rpmfcExpandRegexps(%{?__noautoreqfiles}, fc-RFnmire);
  + if (fc-RFnmire  0)
  + rpmlog(RPMLOG_DEBUG, D_(added %d %%__noautoreqfiles patterns.\n),
  + fc-RFnmire);
  + fc-Pnmire = 0;
  + fc-Pmires = rpmfcExpandRegexps(%{?__noautoprov}, fc-Pnmire);
  + if (fc-Pnmire  0)
  + rpmlog(RPMLOG_DEBUG, D_(added %d %%__noautoprov patterns.\n),
  + fc-Pnmire);
  + fc-Rnmire = 0;
  + fc-Rmires = rpmfcExpandRegexps(%{?__noautoreq}, fc-Rnmire);
  + if (fc-Rnmire  0)
  + rpmlog(RPMLOG_DEBUG, D_(added %d %%__noautoreq patterns.\n),
  + fc-Rnmire);
   }
   
   /* Make sure something didn't go wrong previously! */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/ rpmdav.c rpmio_internal.h

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:26:37
  Branch: HEAD Handle: 2010032100263700

  Modified files:
rpm/rpmio   rpmdav.c rpmio_internal.h

  Log:
- rpmdav: use urlType(u) where needed.
- rpmio: eliminate fd-urltype, use urlType(fd-u) getter instead.

  Summary:
RevisionChanges Path
2.115   +33 -21 rpm/rpmio/rpmdav.c
2.126   +1  -2  rpm/rpmio/rpmio_internal.h
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/rpmdav.c
  
  $ cvs diff -u -r2.114 -r2.115 rpmdav.c
  --- rpm/rpmio/rpmdav.c17 Mar 2010 16:11:46 -  2.114
  +++ rpm/rpmio/rpmdav.c21 Mar 2010 00:26:37 -  2.115
  @@ -115,16 +115,14 @@
   /*...@-mustmod@*/
   int davDisconnect(/*...@unused@*/ void * _u)
   {
  -#ifdef   NOTYET  /* XXX not quite right yet. */
   urlinfo u = (urlinfo)_u;
  -int rc;
  +int rc = 0;
   
   #if WITH_NEON_MIN_VERSION = 0x002700
   rc = (u-info.status == ne_status_sending || u-info.status == 
ne_status_recving);
  -#else
  -rc = 0;  /* XXX W2DO? */
   #endif
  -if (u != NULL  rc != 0) {
  +if (u != NULL) {
  +#ifdef   NOTYET
if (u-ctrl-req != NULL) {
if (u-ctrl  u-ctrl-req) {
ne_request_destroy(u-ctrl-req);
  @@ -135,11 +133,16 @@
u-data-req = NULL;
}
}
  +#else
  +#ifdef   STILL_NOTYET/* XXX closer but no cigar */
  + if (u-sess != NULL)
  + ne_close_connection(u-sess);
  +#endif
  +#endif
   }
   DAVDEBUG(-1, (stderr, -- %s(%p) active %d\n, __FUNCTION__, u, rc));
  -/* XXX return active state? */
  -#endif   /* NOTYET */
  -return 0;
  +rc = 0;  /* XXX return active state? */
  +return rc;
   }
   /*...@=mustmod@*/
   
  @@ -150,7 +153,7 @@
ne_session_destroy(u-sess);
u-sess = NULL;
}
  - switch (u-urltype) {
  + switch (urlType(u)) {
default:
/*...@notreached@*/ break;
case URL_IS_HTTPS:
  @@ -443,8 +446,15 @@
   int rc;
   
   /* HACK: hkp:// has no steenkin' options */
  -if (!(u-urltype == URL_IS_HTTP || u-urltype == URL_IS_HTTPS))
  +switch (urlType(u)) {
  +case URL_IS_HKP:
  +default:
return 0;
  + /*...@notreached@*/ break;
  +case URL_IS_HTTP:
  +case URL_IS_HTTPS:
  + break;
  +}
   
   /* HACK: where should server capabilities be read? */
   (void) urlPath(u-url, path);
  @@ -536,9 +546,9 @@
   /*...@=globs@*/
   
   if (u-url != NULL  u-sess == NULL)
  -switch (u-urltype) {
  +switch (u-ut) {
   default:
  - assert(u-urltype != u-urltype);
  + assert(u-ut != u-ut);
/*...@notreached@*/ break;
   case URL_IS_HTTPS:
   case URL_IS_HTTP:
  @@ -1678,6 +1688,8 @@
   {
   int rc = 0;
   
  +DAVDEBUG(-1, (stderr, -- %s(%p,%p,%p) sess %p req %p\n, __FUNCTION__, u, 
ctrl, str, u-sess, ctrl-req));
  +
   rc = ne_begin_request(ctrl-req);
   rc = my_result(ne_begin_req(ctrl-req), rc, NULL);
   
  @@ -1699,7 +1711,7 @@
   int rc = 0;
   
   assert(ctrl != NULL);
  -u = ctrl-url;
  +u = ctrl-u;
   URLSANE(u);
   
   DAVDEBUG(-1, (stderr, -- %s(%p,%s,\%s\) entry sess %p req %p\n, 
__FUNCTION__, ctrl, httpCmd, (httpArg ? httpArg : ), u-sess, ctrl-req));
  @@ -1808,7 +1820,7 @@
/*...@unused@*/ mode_t mode, /*...@out@*/ urlinfo * uret)
   {
   const char * path = NULL;
  -urltype urlType = urlPath(url, path);
  +urltype ut = urlPath(url, path);
   urlinfo u = NULL;
   FD_t fd = NULL;
   int rc;
  @@ -1832,9 +1844,9 @@
yarnRelease(use);
   }
   
  -if (u-ctrl-url == NULL)
  +if (u-ctrl-u == NULL)
fd = u-ctrl = fdLink(u-ctrl, grab ctrl (davOpen persist ctrl));
  -else if (u-data-url == NULL)
  +else if (u-data-u == NULL)
fd = u-data = fdLink(u-data, grab ctrl (davOpen persist data));
   else
fd = fdNew(grab ctrl (davOpen));
  @@ -1846,9 +1858,8 @@
fd-ftpFileDoneNeeded = 0;
fd-rd_timeoutsecs = rpmioHttpReadTimeoutSecs;
fd-contentLength = fd-bytesRemain = -1;
  -assert(urlType == URL_IS_HTTPS || urlType == URL_IS_HTTP || urlType == 
URL_IS_HKP);
  - fd-urlType = urlType;
  - fd-url = urlLink(u, url (davOpen));
  +assert(ut == URL_IS_HTTPS || ut == URL_IS_HTTP || ut == URL_IS_HKP);
  + fd-u = urlLink(u, url (davOpen));
fd = fdLink(fd, grab data (davOpen));
   }
   
  @@ -1868,7 +1879,7 @@
   
   #if

[CVS] RPM: rpm/tools/ cp.c

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:30:20
  Branch: HEAD Handle: 2010032100302000

  Modified files:
rpm/tools   cp.c

  Log:
- cp: fix: resolve the tedious -R - -r issue by having it both ways.

  Summary:
RevisionChanges Path
2.21+3  -1  rpm/tools/cp.c
  

  patch -p0 '@@ .'
  Index: rpm/tools/cp.c
  
  $ cvs diff -u -r2.20 -r2.21 cp.c
  --- rpm/tools/cp.c9 Jan 2010 22:04:15 -   2.20
  +++ rpm/tools/cp.c21 Mar 2010 00:30:20 -  2.21
  @@ -803,7 +803,7 @@
   /*...@unchecked@*/ /*...@observer@*/
   static struct poptOption optionsTable[] = {
   /*...@-type@*/ /* FIX: cast? */
  - { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | 
POPT_CBFLAG_CONTINUE,
  + { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA,
   copyArgCallback, 0, NULL, NULL },
   /*...@=type@*/
   
  @@ -815,6 +815,8 @@
N_(Never follow symbolic links), NULL },
 { recursive,'R', POPT_ARG_NONE,  NULL, (int)'R',
N_(Copy directories recursively), NULL },
  +  { recursive,'r', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN,  NULL, (int)'R',
  + N_(Copy directories recursively), NULL },
 { archive,'a', POPT_ARG_NONE,NULL, (int)'a',
N_(Archive mode (same as -RpP)), NULL },
 { force,'f', POPT_ARG_NONE,  NULL, (int)'f',
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/db3/ configure

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:33:17
  Branch: HEAD Handle: 2010032100331600

  Modified files:
rpm/db3 configure

  Log:
- db3: filter CC=foo from input args. add note-to-self explaining why.

  Summary:
RevisionChanges Path
1.38+3  -1  rpm/db3/configure
  

  patch -p0 '@@ .'
  Index: rpm/db3/configure
  
  $ cvs diff -u -r1.37 -r1.38 configure
  --- rpm/db3/configure 10 May 2009 18:01:51 -  1.37
  +++ rpm/db3/configure 21 Mar 2010 00:33:16 -  1.38
  @@ -13,7 +13,8 @@
   set -- $@ eoa_marker
   while [ $1 != eoa_marker ]; do
  ARG=`echo $1 | \
  -   sed -e 's%CFLAGS=.*%%' \
  +   sed -e 's%CC=g++%CC=gcc%' \
  +   -e 's%CFLAGS=.*%%' \
  -e 's%--param=.*%%g' \
  -e 's%--cache-file=.*$%%' \
  -e 's%--with-db-rpc=\(.*\)%--enable-rpc=\1%' \
  @@ -39,6 +40,7 @@
   #   2. --enable-static is there for enforcing the building of a static
   #  version of the libdb objects RPM actually is interested in.
   
  +# XXX Berkeley DB fails to find a locking scheme if CC=g++
   CC=$CC CFLAGS=$CFLAGS $db_dist/configure $@ \
--enable-shared --enable-static \
--with-uniquename=_rpmdb --srcdir=$db_dist || exit 1
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ system.h

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:34:59
  Branch: HEAD Handle: 2010032100345800

  Modified files:
rpm system.h

  Log:
- system: don't retrofit missing statFu if CC=g++, these aren't
defined in C++?

  Summary:
RevisionChanges Path
2.128   +2  -0  rpm/system.h
  

  patch -p0 '@@ .'
  Index: rpm/system.h
  
  $ cvs diff -u -r2.127 -r2.128 system.h
  --- rpm/system.h  6 Dec 2009 20:20:44 -   2.127
  +++ rpm/system.h  21 Mar 2010 00:34:58 -  2.128
  @@ -591,6 +591,7 @@
   /*...@=declundef =incondefs @*/
   #endif
   
  +#if !defined(__cplusplus)
   #if !defined(HAVE_S_IFSOCK)
   #define S_IFSOCK (0xc000)
   #endif
  @@ -602,6 +603,7 @@
   #if !defined(HAVE_S_ISSOCK)
   #define S_ISSOCK(mode) ((mode  0xf000) == S_IFSOCK)
   #endif
  +#endif /* !defined(__cplusplus) */
   
   #if defined(NEED_STRINGS_H)
   #include strings.h
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2010-03-20 Thread Jeff Johnson

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  

  Server: rpm5.org Name:   Jeff Johnson
  Root:   /v/rpm/cvs   Email:  j...@rpm5.org
  Module: rpm  Date:   21-Mar-2010 01:36:04
  Branch: HEAD Handle: 2010032100360300

  Modified files:
rpm devtool.conf

  Log:
- devtool: remember how I'm currently building RPM.

  Summary:
RevisionChanges Path
2.333   +5  -2  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.332 -r2.333 devtool.conf
  --- rpm/devtool.conf  18 Jan 2010 04:29:32 -  2.332
  +++ rpm/devtool.conf  21 Mar 2010 00:36:03 -  2.333
  @@ -70,6 +70,7 @@
   #   development tools and the third-party libraries to be installed
   #   in system locations.
   %autogen
  +export LDFLAGS=-L/usr/lib/nix
   %configure \
   --verbose \
   --prefix=/usr \
  @@ -104,10 +105,12 @@
   --with-libelf \
   --with-cudf \
   --with-ficl=none \
  +--with-aterm=/usr/lib/nix:/usr/include/nix \
  +--with-nix=/usr/lib/nix:/usr/include/nix \
   --with-bash=internal \
   --with-rc=internal \
  ---with-js=/usr/local/gpsee/jsapi \
  ---with-gpsee=/usr/local/gpsee \
  +--without-js \
  +--without-gpsee \
   --with-python \
   --with-pythonembed=/usr/lib:/usr/include/python2.6 \
   --with-perl \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/build/ spec.c

[CVS] RPM: rpm/ configure.ac

[CVS] RPM: rpm/rpmio/ Makefile.am

[CVS] RPM: rpm/rpmio/ librpmio.vers

[CVS] RPM: rpm/rpmio/ mire.c

[CVS] RPM: rpm/lib/ rpmfc.c

[CVS] RPM: rpm/rpmio/ rpmdav.c rpmio_internal.h

[CVS] RPM: rpm/tools/ cp.c

[CVS] RPM: rpm/db3/ configure

[CVS] RPM: rpm/ system.h

[CVS] RPM: rpm/ devtool.conf

11 matches

Site Navigation

Mail list logo

Footer information