RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ configure.ac devtool.conf

From: Anders F. Björklund <afb@rpm5.org>
Date: Sat 01 Dec 2007 - 12:10:29 CET
Message-Id: <20071201111029.842A3348454@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:   01-Dec-2007 12:10:29
  Branch: HEAD                             Handle: 2007120111102900

  Modified files:
    rpm                     configure.ac devtool.conf

  Log:
    aha, so _that_ was why it didn't work on Leopard

  Summary:
    Revision    Changes     Path
    2.256       +1  -1      rpm/configure.ac
    2.136       +0  -3      rpm/devtool.conf
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.255 -r2.256 configure.ac
  --- rpm/configure.ac	1 Dec 2007 09:36:35 -0000	2.255
  +++ rpm/configure.ac	1 Dec 2007 11:10:29 -0000	2.256
  @@ -538,7 +538,7 @@
   dnl # problems when linking against the third-party libraries.
   dnl # Force ld(1) to stick standard Unix search path order.
   case "$host" in
  -    *-*-darwin8* ) LDFLAGS="$LDFLAGS -Wl,-search_paths_first" ;;
  +    *-*-darwin* ) LDFLAGS="$LDFLAGS -Wl,-search_paths_first" ;;
   esac
   
   dnl # FIXME: platform-hack: SCO and SunOS 4.x
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/devtool.conf
  ============================================================================
  $ cvs diff -u -r2.135 -r2.136 devtool.conf
  --- rpm/devtool.conf	28 Nov 2007 00:09:49 -0000	2.135
  +++ rpm/devtool.conf	1 Dec 2007 11:10:29 -0000	2.136
  @@ -777,9 +777,6 @@
           if [ ".`grep 'OpenPKG RPM' ${DEVTOOL_SRCDIR}/rpmqv.c`" != . ]; then
               CPPFLAGS="$CPPFLAGS -DOPENPKG"
           fi
  -        if [ "`uname`" = "Darwin" ]; then
  -            LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
  -        fi
           LDFLAGS="$LDFLAGS -L$base3rd/bin/$platform/openssl-${v_openssl}" # shameless workaround for Neon
           LIBS="$LIBS -lssl -lcrypto"                                      # shameless workaround for Neon
           LIBS="$LIBS -lm"                                                 # shameless workaround for SQLite
  @@ .
Received on Sat Dec 1 12:10:29 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.