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:
    Revision    Changes     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 -0000      1.37
  +++ rpm/db3/configure 21 Mar 2010 00:33:16 -0000      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 Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to