apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Orton <jor...@redhat.com>
Subject Re: svn commit: r111346 - /apr/apr/trunk/CHANGES /apr/apr/trunk/apr-config.in
Date Wed, 19 Jan 2005 12:21:07 GMT
On Mon, Jan 17, 2005 at 09:04:52PM +0000, Joe Orton wrote:
> On Mon, Jan 17, 2005 at 10:01:12AM -0800, Justin Erenkrantz wrote:
> > It's the libtool15 port on FreeBSD.  Note that it does work okay with libtool
> > 1.5.10 on Solaris.  (You can test it with your www.apache.org login.)
> > 
> > Digging a bit, I think it's due to the following patch that FreeBSD applies:
> > 
> > <http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libtool15/files/patch-ltmain.sh>
> > 
> > The last hunk says "Do not install the useless pseudo-library".
> > 
> > Feel free to take it up with the libtool15 FreeBSD port folks, if you like.  I
> > hate libtool enough that I can't convince myself to blame them.  =)  -- justin
> 
> Ah, those pesky packagers again eh?  OK I have send-pr'd it:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=76363

They say to use the "gnu-libtool" port rather than one of the versioned
libtool ports, and that the latter are deliberately broken^Wdifferent
and not for use outside the ports packages.  I presume the "gnu-libtool"
port installs a real "libtoolize" into $PATH.

Given this fact I think buildconf will have to be changed to not use
libtoolize{15,14} if available.  Does this look OK?  It also resolve the
glibtool.m4 vs libtool.m4 problem...

* buildconf: Don't use libtoolize{14,15} since the FreeBSD versions
are crippled.  Allow $LIBTOOLIZE to choose a specific libtoolize.

* build/buildcheck.sh: Check for libtoolize not libtool in $PATH, and
use $LIBTOOLIZE, per buildconf.

Index: buildconf
===================================================================
--- buildconf	(revision 125619)
+++ buildconf	(working copy)
@@ -22,7 +22,7 @@
 #
 build/buildcheck.sh || exit 1
 
-libtoolize=`build/PrintPath glibtoolize libtoolize libtoolize15 libtoolize14`
+libtoolize=${LIBTOOLIZE:-`build/PrintPath glibtoolize libtoolize`}
 if [ "x$libtoolize" = "x" ]; then
     echo "libtoolize not found in path"
     exit 1
@@ -45,9 +45,8 @@
 if [ -f libtool.m4 ]; then 
    ltfile=`pwd`/libtool.m4
 else
-   libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
-   ltpath=`dirname $libtool`
-   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/`basename $libtool`.m4}
+   ltpath=`dirname $libtoolize`
+   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
 fi
   
 if [ ! -f $ltfile ]; then
Index: build/buildcheck.sh
===================================================================
--- build/buildcheck.sh	(revision 125619)
+++ build/buildcheck.sh	(working copy)
@@ -32,16 +32,16 @@
 echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
-# Sample libtool --version outputs:
+# Sample libtoolize --version outputs:
 # ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
 # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
 # output is multiline from 1.5 onwards
 
 # Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool libtool libtool15 libtool14`
+libtool=${LIBTOOLIZE:-`build/PrintPath glibtoolize libtoolize`}
 lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 if test -z "$lt_pversion"; then
-echo "buildconf: libtool not found."
+echo "buildconf: libtoolize not found."
 echo "           You need libtool version 1.4 or newer installed"
 echo "           to build APR from CVS."
 exit 1


joe

Mime
View raw message