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

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   12-Apr-2008 22:57:19
  Branch: rpm-5_1                          Handle: 2008041220571900

  Modified files:           (Branch: rpm-5_1)
    rpm                     devtool.conf

  Log:
    macosx: disable intl/iconv for popt 1.14

  Summary:
    Revision    Changes     Path
    2.205.2.5   +4  -1      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.205.2.4 -r2.205.2.5 devtool.conf
  --- rpm/devtool.conf  11 Apr 2008 20:28:48 -0000      2.205.2.4
  +++ rpm/devtool.conf  12 Apr 2008 20:57:19 -0000      2.205.2.5
  @@ -1387,12 +1387,15 @@
                   (   cd popt-${v_popt}
                       patch -p0 <../../src/popt-${v_popt}.patch
                       CC="$UNIVERSAL_CC" \
  -                    CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
  +                    CPPFLAGS="$UNIVERSAL_CPPFLAGS -DPOPT_fprintf=fprintf" \
                       CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
                       LDFLAGS="$UNIVERSAL_LDFLAGS" \
                       ./configure $UNIVERSAL_TARGET \
                           --disable-dependency-tracking \
                           --disable-shared \
  +                        --with-included-gettext \
  +                        --without-libintl-prefix \
  +                        --without-libiconv-prefix \
                           --disable-nls
                       make
                   ) || exit $?
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to