RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ devtool.conf

From: Anders F. Björklund <afb@rpm5.org>
Date: Wed 05 Dec 2007 - 11:51:14 CET
Message-Id: <20071205105114.B88EC34845F@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   05-Dec-2007 11:51:14
  Branch: HEAD                             Handle: 2007120510511400

  Modified files:
    rpm                     devtool.conf

  Log:
    allow darwin to link with static openssl lib (and others) - normally
    handled by automake

  Summary:
    Revision    Changes     Path
    2.140       +2  -1      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.139 -r2.140 devtool.conf
  --- rpm/devtool.conf	5 Dec 2007 09:53:17 -0000	2.139
  +++ rpm/devtool.conf	5 Dec 2007 10:51:14 -0000	2.140
  @@ -794,9 +794,10 @@
                   $gzip -d -c ../../src/xar-${v_xar}.tar.gz | $tar xf -
                   (   cd xar-${v_xar}
                       $patch -p0 <../../../src/xar-${v_xar}.patch
  +                    if [ "`uname`" = "Darwin" ]; then STATICFLAGS="-Wl,-search_paths_first"; fi
                       CC="$cc" \
                       CPPFLAGS="-I`pwd`/../openssl-${v_openssl}/include -I`pwd`/../zlib-${v_zlib} -I`pwd`/../libxml2-${v_libxml2}/include" \
  -                    LDFLAGS="-L`pwd`/../openssl-${v_openssl}/lib -L`pwd`/../zlib-${v_zlib} -L`pwd`/../libxml2-${v_libxml2} -L`pwd`/../libxml2-${v_libxml2}/.libs" \
  +                    LDFLAGS="-L`pwd`/../openssl-${v_openssl}/lib -L`pwd`/../zlib-${v_zlib} -L`pwd`/../libxml2-${v_libxml2} -L`pwd`/../libxml2-${v_libxml2}/.libs $STATICFLAGS" \
                       ./configure \
                           --disable-autogen \
                           --disable-shared
  @@ .
Received on Wed Dec 5 11:51:14 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.