Date: Wed, 20 Sep 2000 11:48:11 +0300 From: Maxim Sobolev <sobomax@FreeBSD.org> To: reg@FreeBSD.org Cc: ports@FreeBSD.org Subject: Patch for libtool port to keep USE_LIBTOOL hack compatible with configure scripts generated for libtool1.4 Message-ID: <39C879CB.D63CCF39@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------659E79F0B379F57254BB96F1
Content-Type: text/plain; charset=koi8-r
Content-Transfer-Encoding: 7bit
Hi,
I wonder if anyone noticed that configure scrripts generated for libtool1.4
could not be uses unmodified with USE_LIBTOOL hack. The problem is that those
configures calls ltconfig with "--build=blabla" option, which doesn't exists in
libtool1.3.1, so configure script bails out. Of course patch can be applied to
all those configure scripts, but given increasing number of software based on
1.4 it probably would be better to patch out libtool port. With this message
I'm attaching patch against current libtool port which should solve the
problem.
To give you a point for estimating usability of this patch following is the
list of patches, which contain workarrounds mentioned above:
audio/sdl_mixer/patches/patch-ab
databases/metakit/patches/patch-ad
devel/sdl/patches/patch-ac
graphics/ImageMagick/patches/patch-aj
net/icqlib/patches/patch-ad
textproc/aspell/patches/patch-ah
textproc/pspell/patches/patch-aa
textproc/pspell/patches/patch-ab
textproc/pspell-ispell/patches/patch-aa
-Maxim
--------------659E79F0B379F57254BB96F1
Content-Type: text/plain; charset=koi8-r;
name="libtool.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="libtool.patch"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/Makefile,v
retrieving revision 1.11
diff -d -u -r1.11 Makefile
--- Makefile 2000/04/11 21:28:49 1.11
+++ Makefile 2000/09/20 08:44:42
@@ -7,6 +7,7 @@
PORTNAME= libtool
PORTVERSION= 1.3.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
Index: patches/patch-ac
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/patches/patch-ac,v
retrieving revision 1.9
diff -d -u -r1.9 patch-ac
--- patches/patch-ac 2000/04/02 08:26:22 1.9
+++ patches/patch-ac 2000/09/20 08:44:42
@@ -1,5 +1,5 @@
---- ltconfig.orig Tue Dec 7 13:50:48 1999
-+++ ltconfig Mon Jan 17 16:31:24 2000
+--- ltconfig.orig Tue Dec 7 23:50:48 1999
++++ ltconfig Wed Sep 20 11:11:39 2000
@@ -169,7 +169,7 @@
# Constants:
PROGRAM=ltconfig
@@ -18,7 +18,12 @@
enable_dlopen=unknown
enable_win32_dll=no
ltmain=
-@@ -246,6 +248,9 @@
+@@ -242,10 +244,14 @@
+
+ Generate a system-specific libtool script.
+
++ --build no-op to keep compatability with configure scripts generated for 1.4
+ --debug enable verbose shell tracing
--disable-shared do not build shared libraries
--disable-static do not build static libraries
--disable-fast-install do not optimize for fast installation
@@ -28,7 +33,16 @@
--enable-dlopen enable dlopen support
--enable-win32-dll enable building dlls on win32 hosts
--help display this help and exit
-@@ -279,6 +284,12 @@
+@@ -268,6 +274,8 @@
+ exit 0
+ ;;
+
++ --build=*) ;;
++
+ --debug)
+ echo "$progname: enabling shell trace mode"
+ set -x
+@@ -279,6 +287,12 @@
--disable-fast-install) enable_fast_install=no ;;
@@ -41,7 +55,7 @@
--enable-dlopen) enable_dlopen=yes ;;
--enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +982,11 @@
+@@ -971,11 +985,11 @@
$rm conftest.dat
if ln -s X conftest.dat 2>/dev/null; then
$rm conftest.dat
@@ -55,7 +69,7 @@
echo "$ac_t"yes 1>&6
else
echo "$ac_t"no 1>&6
-@@ -1226,8 +1237,8 @@
+@@ -1226,8 +1240,8 @@
*)
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
@@ -66,7 +80,7 @@
else
ld_shlibs=no
fi
-@@ -1353,14 +1364,6 @@
+@@ -1353,14 +1367,6 @@
hardcode_shlibpath_var=no
;;
@@ -81,7 +95,7 @@
hpux9* | hpux10* | hpux11*)
case "$host_os" in
hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1778,7 @@
+@@ -1775,7 +1781,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -90,7 +104,7 @@
file_magic_cmd=
file_magic_test_file=
deplibs_check_method='unknown'
-@@ -1874,18 +1877,21 @@
+@@ -1874,18 +1880,21 @@
case "$version_type" in
freebsd-elf*)
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
@@ -120,7 +134,7 @@
shlibpath_var=LD_LIBRARY_PATH
case "$host_os" in
freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2782,15 @@
+@@ -2776,6 +2785,15 @@
# Shell to use when invoking shell scripts.
SHELL=$LTSHELL
--------------659E79F0B379F57254BB96F1--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?39C879CB.D63CCF39>