RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: xar rpm file zlib Date: 12-Aug-2008 20:46:13
Branch: rpm-5_1 Handle: 2008081218461201
Modified files: (Branch: rpm-5_1)
file autogen.sh
rpm CHANGES autogen.sh
xar autogen.sh
zlib autogen.sh
Log:
- jbj: permit building with older libtool-1.5.26 (back port from
HEAD).
Summary:
Revision Changes Path
1.36.2.3 +10 -5 file/autogen.sh
1.2288.2.73 +1 -0 rpm/CHANGES
2.90.2.3 +10 -5 rpm/autogen.sh
1.10.2.3 +10 -5 xar/autogen.sh
1.14.2.3 +10 -5 zlib/autogen.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: file/autogen.sh
============================================================================
$ cvs diff -u -r1.36.2.2 -r1.36.2.3 autogen.sh
--- file/autogen.sh 24 May 2008 18:24:23 -0000 1.36.2.2
+++ file/autogen.sh 12 Aug 2008 18:46:12 -0000 1.36.2.3
@@ -8,15 +8,16 @@
USAGE="
To build RPM from plain CVS sources the following
installed developer tools are mandatory:
- GNU automake 1.10
- GNU autoconf 2.62
- GNU libtool 2.2.4
- GNU gettext 0.17
+ $AMV
+ $ACV
+ $LTV
+ $GTT
"
# wrapper for running GNU libtool's libtoolize(1)
libtoolize () {
_libtoolize=`which glibtoolize 2>/dev/null`
+ _libtoolize_args="$*"
case "$_libtoolize" in
/* ) ;;
* ) _libtoolize=`which libtoolize 2>/dev/null`
@@ -26,7 +27,11 @@
esac
;;
esac
- $_libtoolize ${1+"$@"}
+ _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e 's;^[^0-9]*;;'`"
+ case "$_libtoolize_version" in
+ 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
+ esac
+ eval $_libtoolize $_libtoolize_args
}
# requirements sanity check
@@ .
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.72 -r1.2288.2.73 CHANGES
--- rpm/CHANGES 18 Jul 2008 13:05:34 -0000 1.2288.2.72
+++ rpm/CHANGES 12 Aug 2008 18:46:12 -0000 1.2288.2.73
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: permit building with older libtool-1.5.26 (back port from HEAD).
- bero: Fix hang when using rpmdsSingle and rpm4compat.h from C++
- rse: configure: do not complain with "python: file not found" on platforms without python(1) in PATH
@@ .
patch -p0 <<'@@ .'
Index: rpm/autogen.sh
============================================================================
$ cvs diff -u -r2.90.2.2 -r2.90.2.3 autogen.sh
--- rpm/autogen.sh 24 May 2008 18:24:23 -0000 2.90.2.2
+++ rpm/autogen.sh 12 Aug 2008 18:46:12 -0000 2.90.2.3
@@ -8,15 +8,16 @@
USAGE="
To build RPM from plain CVS sources the following
installed developer tools are mandatory:
- GNU automake 1.10
- GNU autoconf 2.62
- GNU libtool 2.2.4
- GNU gettext 0.17
+ $AMV
+ $ACV
+ $LTV
+ $GTT
"
# wrapper for running GNU libtool's libtoolize(1)
libtoolize () {
_libtoolize=`which glibtoolize 2>/dev/null`
+ _libtoolize_args="$*"
case "$_libtoolize" in
/* ) ;;
* ) _libtoolize=`which libtoolize 2>/dev/null`
@@ -26,7 +27,11 @@
esac
;;
esac
- $_libtoolize ${1+"$@"}
+ _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e 's;^[^0-9]*;;'`"
+ case "$_libtoolize_version" in
+ 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
+ esac
+ eval $_libtoolize $_libtoolize_args
}
# requirements sanity check
@@ .
patch -p0 <<'@@ .'
Index: xar/autogen.sh
============================================================================
$ cvs diff -u -r1.10.2.2 -r1.10.2.3 autogen.sh
--- xar/autogen.sh 24 May 2008 18:24:23 -0000 1.10.2.2
+++ xar/autogen.sh 12 Aug 2008 18:46:13 -0000 1.10.2.3
@@ -8,15 +8,16 @@
USAGE="
To build RPM from plain CVS sources the following
installed developer tools are mandatory:
- GNU automake 1.10
- GNU autoconf 2.62
- GNU libtool 2.2.4
- GNU gettext 0.17
+ $AMV
+ $ACV
+ $LTV
+ $GTT
"
# wrapper for running GNU libtool's libtoolize(1)
libtoolize () {
_libtoolize=`which glibtoolize 2>/dev/null`
+ _libtoolize_args="$*"
case "$_libtoolize" in
/* ) ;;
* ) _libtoolize=`which libtoolize 2>/dev/null`
@@ -26,7 +27,11 @@
esac
;;
esac
- $_libtoolize ${1+"$@"}
+ _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e 's;^[^0-9]*;;'`"
+ case "$_libtoolize_version" in
+ 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
+ esac
+ eval $_libtoolize $_libtoolize_args
}
# requirements sanity check
@@ .
patch -p0 <<'@@ .'
Index: zlib/autogen.sh
============================================================================
$ cvs diff -u -r1.14.2.2 -r1.14.2.3 autogen.sh
--- zlib/autogen.sh 24 May 2008 18:24:24 -0000 1.14.2.2
+++ zlib/autogen.sh 12 Aug 2008 18:46:13 -0000 1.14.2.3
@@ -8,15 +8,16 @@
USAGE="
To build RPM from plain CVS sources the following
installed developer tools are mandatory:
- GNU automake 1.10
- GNU autoconf 2.62
- GNU libtool 2.2.4
- GNU gettext 0.17
+ $AMV
+ $ACV
+ $LTV
+ $GTT
"
# wrapper for running GNU libtool's libtoolize(1)
libtoolize () {
_libtoolize=`which glibtoolize 2>/dev/null`
+ _libtoolize_args="$*"
case "$_libtoolize" in
/* ) ;;
* ) _libtoolize=`which libtoolize 2>/dev/null`
@@ -26,7 +27,11 @@
esac
;;
esac
- $_libtoolize ${1+"$@"}
+ _libtoolize_version="`$_libtoolize --version | sed -e '1q' | sed -e 's;^[^0-9]*;;'`"
+ case "$_libtoolize_version" in
+ 1.* ) _libtoolize_args=`echo "X$_libtoolize_args" | sed -e 's;^X;;' -e 's;--quiet;;' -e 's;--install;;'` ;;
+ esac
+ eval $_libtoolize $_libtoolize_args
}
# requirements sanity check
@@ .
Received on Tue Aug 12 20:46:13 2008