RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ configure.ac

From: Ralf S. Engelschall <rse@rpm5.org>
Date: Mon 25 Jun 2007 - 09:56:53 CEST
Message-Id: <20070625075653.779E23484F1@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm                              Date:   25-Jun-2007 09:56:53
  Branch: HEAD                             Handle: 2007062508565300

  Modified files:
    rpm                     configure.ac

  Log:
    shrink the find-provides and find-requires handling (no need to
    directly echo anything IMHO)

  Summary:
    Revision    Changes     Path
    2.128       +1  -14     rpm/configure.ac
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/configure.ac
  ============================================================================
  $ cvs diff -u -r2.127 -r2.128 configure.ac
  --- rpm/configure.ac	25 Jun 2007 07:52:23 -0000	2.127
  +++ rpm/configure.ac	25 Jun 2007 07:56:53 -0000	2.128
  @@ -993,53 +993,40 @@
   fi
   AC_SUBST(varprefix)
   
  -# get rid of the 4-th tuple, if config.guess returned "linux-gnu" for build_os
  +dnl # provide platform-specific "find-provides" and "find-requires" script symlinks
   if echo "$build_os" | grep '.*-gnulibc1' > /dev/null ; then
   	build_os=`echo "${build_os}" | sed 's/-gnulibc1$//'`
   fi
   if echo "$build_os" | grep '.*-gnu' > /dev/null ; then
   	build_os=`echo "${build_os}" | sed 's/-gnu$//'`
   fi
  -
   changequote(<, >)
   build_os_exact="${build_os}"
   build_os_major=`echo "${build_os}" | sed 's/\..*$//'`
   build_os_noversion=`echo "${build_os}" | sed 's/[0-9]*\..*$//'`
   changequote([, ])
  -
   rm -f ./find-provides
   if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ; then
  -	echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov for automatic provides generation"
       ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.prov ./find-provides
   elif test -f ${srcdir}/autodeps/${build_os_exact}.prov ; then
  -	echo "using ${srcdir}/autodeps/${build_os_exact}.prov for automatic provides generation"
       ln -s ${srcdir}/autodeps/${build_os_exact}.prov ./find-provides
   elif test -f ${srcdir}/autodeps/${build_os_major}.prov ; then
  -	echo "using ${srcdir}/autodeps/${build_os_major}.prov for automatic provides generation"
       ln -s ${srcdir}/autodeps/${build_os_major}.prov ./find-provides
   elif test -f ${srcdir}/autodeps/${build_os_noversion}.prov ; then
  -	echo "using ${srcdir}/autodeps/${build_os_noversion}.prov for automatic provides generation"
       ln -s ${srcdir}/autodeps/${build_os_noversion}.prov ./find-provides
   else
  -    echo "*** no default provides information is available for ${build_os_noversion}"
       ln -s ${srcdir}/autodeps/none ./find-provides
   fi
  -
   rm -f ./find-requires
   if test -f ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ; then
  -	echo "using ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req for automatic requires generation"
       ln -s ${srcdir}/autodeps/${build_cpu}-${build_os_exact}.req ./find-requires
   elif test -f ${srcdir}/autodeps/${build_os_exact}.req ; then
  -	echo "using ${srcdir}/autodeps/${build_os_exact}.req for automatic requires generation"
       ln -s ${srcdir}/autodeps/${build_os_exact}.req ./find-requires
   elif test -f ${srcdir}/autodeps/${build_os_major}.req ; then
  -	echo "using ${srcdir}/autodeps/${build_os_major}.req for automatic requires generation"
       ln -s ${srcdir}/autodeps/${build_os_major}.req ./find-requires
   elif test -f ${srcdir}/autodeps/${build_os_noversion}.req ; then
  -	echo "using ${srcdir}/autodeps/${build_os_noversion}.req for automatic requires generation"
       ln -s ${srcdir}/autodeps/${build_os_noversion}.req ./find-requires
   else
  -    echo "*** no default requires information is available for ${build_os_noversion}"
       ln -s ${srcdir}/autodeps/none ./find-requires
   fi
   
  @@ .
Received on Mon Jun 25 09:56:53 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.