From owner-freebsd-ports Mon Mar 27 0:56:34 2000 Delivered-To: freebsd-ports@freebsd.org Received: from rock.ghis.net (rock.ghis.net [209.222.164.7]) by hub.freebsd.org (Postfix) with ESMTP id EF1B837BA4F for ; Mon, 27 Mar 2000 00:56:11 -0800 (PST) (envelope-from will@blackdawn.com) Received: from argon.blackdawn.com ([209.69.196.194]) by rock.ghis.net (8.9.3/8.9.3) with ESMTP id AAA16262 for ; Mon, 27 Mar 2000 00:56:08 -0800 (PST) Received: by argon.blackdawn.com (Postfix, from userid 1000) id 343131A48; Mon, 27 Mar 2000 03:55:59 -0500 (EST) Date: Mon, 27 Mar 2000 03:55:59 -0500 From: Will Andrews To: ports@FreeBSD.org Subject: Solution for KDE - upgrade of libtool Message-ID: <20000327035558.H73880@argon.blackdawn.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Kj7319i9nmIyA2yE" X-Mailer: Mutt 1.0i X-Operating-System: FreeBSD 5.0-CURRENT i386 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --Kj7319i9nmIyA2yE Content-Type: text/plain; charset=us-ascii Hello folks, A preliminary test of an upgrade for libtool from 1.3.3 to 1.3.4 suggests that the solution to building kdelibs11 on FreeBSD 5.0-CURRENT with USE_LIBTOOL is to upgrade libtool. Patch below was kindly donated by Andrzej Tobola . Thank you so much for your work!! Some KDE ports, notably devel/kdevelop, don't like that kdelibs11 doesn't install *.la files with this version of libtool. Others are fine. This gets kdelibs working on 5.0-CURRENT, but (I haven't tested yet) will break some KDE ports under all versions of FreeBSD. I'll have to do some further tests with this... Satoshi? :-)) I hate this broken crap. :-( -- Will Andrews GCS/E/S @d- s+:+>+:- a--->+++ C++ UB++++ P+ L- E--- W+++ !N !o ?K w--- ?O M+ V-- PS+ PE++ Y+ PGP+>+++ t++ 5 X++ R+ tv+ b++>++++ DI+++ D+ G++>+++ e->++++ h! r-->+++ y? --Kj7319i9nmIyA2yE Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patchff diff -ru libtool-1.3.3/Makefile libtool-1.3.4/Makefile --- libtool-1.3.3/Makefile Mon Mar 20 18:32:49 2000 +++ libtool-1.3.4/Makefile Mon Mar 20 17:33:43 2000 @@ -6,7 +6,7 @@ # $FreeBSD: ports/devel/libtool/Makefile,v 1.9 2000/01/29 22:15:54 steve Exp $ # -DISTNAME= libtool-1.3.3 +DISTNAME= libtool-1.3.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool diff -ru libtool-1.3.3/files/md5 libtool-1.3.4/files/md5 --- libtool-1.3.3/files/md5 Mon Mar 20 18:32:48 2000 +++ libtool-1.3.4/files/md5 Mon Mar 20 17:35:11 2000 @@ -1 +1 @@ -MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b +MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e diff -ru libtool-1.3.3/patches/patch-ac libtool-1.3.4/patches/patch-ac --- libtool-1.3.3/patches/patch-ac Mon Mar 20 18:32:49 2000 +++ libtool-1.3.4/patches/patch-ac Mon Mar 20 17:53:45 2000 @@ -1,14 +1,14 @@ ---- ltconfig.orig Fri Jul 2 09:02:37 1999 -+++ ltconfig Sat Sep 4 11:34:21 1999 +--- ltconfig.orig Tue Dec 7 22:50:48 1999 ++++ ltconfig Mon Mar 20 17:52:53 2000 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3.3 -+VERSION=1.3.3-freebsd-ports - TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' +-VERSION=1.3.4 ++VERSION=1.3.4-freebsd-ports + TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' @@ -185,6 +185,8 @@ # which needs '.lib'). enable_static=yes @@ -66,7 +66,7 @@ else ld_shlibs=no fi -@@ -1348,14 +1359,6 @@ +@@ -1353,14 +1364,6 @@ hardcode_shlibpath_var=no ;; @@ -81,7 +81,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' ;; -@@ -1732,7 +1735,7 @@ +@@ -1775,7 +1778,7 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" @@ -90,7 +90,7 @@ file_magic_cmd= file_magic_test_file= deplibs_check_method='unknown' -@@ -1829,19 +1832,21 @@ +@@ -1874,18 +1877,21 @@ case "$version_type" in freebsd-elf*) deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object' @@ -107,7 +107,6 @@ + deplibs_check_method='file_magic FreeBSD.* shared library' ;; esac -- finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + file_magic_cmd=/usr/bin/file + file_magic_test_file=`echo /usr/lib/libc.so.*` + if test "$release_suffix" = all; then @@ -120,8 +119,8 @@ + finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir' shlibpath_var=LD_LIBRARY_PATH case "$host_os" in - freebsd2* | freebsd3.[01]*) -@@ -2719,6 +2724,15 @@ + freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*) +@@ -2776,6 +2782,15 @@ # Shell to use when invoking shell scripts. SHELL=$LTSHELL diff -ru libtool-1.3.3/patches/patch-ad libtool-1.3.4/patches/patch-ad --- libtool-1.3.3/patches/patch-ad Mon Mar 20 18:32:49 2000 +++ libtool-1.3.4/patches/patch-ad Mon Mar 20 17:57:38 2000 @@ -1,15 +1,15 @@ ---- ltmain.sh.orig Fri Jul 2 09:02:40 1999 -+++ ltmain.sh Wed Sep 15 00:00:38 1999 +--- ltmain.sh.orig Tue Dec 7 22:50:49 1999 ++++ ltmain.sh Mon Mar 20 17:56:40 2000 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3.3 -+VERSION=1.3.3-freebsd-ports - TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" +-VERSION=1.3.4 ++VERSION=1.3.4-freebsd-ports + TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)" default_mode= -@@ -946,7 +946,11 @@ +@@ -952,7 +952,11 @@ continue ;; release) @@ -22,7 +22,7 @@ prev= continue ;; -@@ -999,6 +1003,7 @@ +@@ -1005,6 +1009,7 @@ ;; -avoid-version) @@ -30,7 +30,7 @@ avoid_version=yes continue ;; -@@ -1085,6 +1090,10 @@ +@@ -1091,6 +1096,10 @@ deplibs="$deplibs $arg" ;; @@ -41,7 +41,7 @@ -module) module=yes continue -@@ -1162,7 +1171,7 @@ +@@ -1168,7 +1177,7 @@ *.o | *.obj | *.a | *.lib) # A standard object. @@ -50,7 +50,7 @@ ;; *.lo) -@@ -1789,6 +1798,9 @@ +@@ -1795,6 +1804,9 @@ *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) # these systems don't actually have a c library (as such)! ;; @@ -60,7 +60,7 @@ *) # Add libc to deplibs on all other systems. deplibs="$deplibs -lc" -@@ -1796,6 +1808,94 @@ +@@ -1802,6 +1814,94 @@ esac fi @@ -155,7 +155,7 @@ # Create the output directory, or remove our outputs if we need to. if test -d $output_objdir; then $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*" -@@ -1811,7 +1911,11 @@ +@@ -1817,7 +1917,11 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then @@ -168,7 +168,7 @@ # Transform .lo files to .o files. oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` -@@ -2005,7 +2109,11 @@ +@@ -2011,7 +2115,11 @@ echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -181,7 +181,7 @@ build_libtool_libs=module build_old_libs=yes else -@@ -3026,7 +3134,11 @@ +@@ -3059,7 +3167,11 @@ case "$output" in *.la) old_library= @@ -194,7 +194,7 @@ $show "creating $output" if test -n "$xrpath"; then -@@ -3315,10 +3427,12 @@ +@@ -3348,10 +3460,12 @@ fi # Install the pseudo-library for information purposes. @@ -211,7 +211,7 @@ # Maybe install the static library, too. test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" -@@ -3407,7 +3521,6 @@ +@@ -3440,7 +3554,6 @@ fi libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`" if test -n "$libdir" && test ! -f "$libfile"; then diff -ru libtool-1.3.3/patches/patch-af libtool-1.3.4/patches/patch-af --- libtool-1.3.3/patches/patch-af Mon Mar 20 18:32:49 2000 +++ libtool-1.3.4/patches/patch-af Mon Mar 20 18:01:49 2000 @@ -1,6 +1,6 @@ ---- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 -+++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 -@@ -328,17 +328,16 @@ +--- libltdl/Makefile.in.orig Tue Dec 7 22:03:38 1999 ++++ libltdl/Makefile.in Mon Mar 20 18:01:14 2000 +@@ -326,17 +326,16 @@ distdir: $(DISTFILES) -rm -rf $(distdir) mkdir $(distdir) @@ -9,7 +9,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ -- cp -pr $$/$$file $(distdir)/$$file; \ +- cp -pr $$d/$$file $(distdir)/$$file; \ + echo no copy dir $$d/$$file; \ else \ - test -f $(distdir)/$$file \ --Kj7319i9nmIyA2yE-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message