Revert previous change it didn't work. Instead force the inclusion of a

CC tag configuration so that --tag=CC works.

3 files changed, 30 insertions, 36 deletions

diff --git a/devel/libtool/files/patch-sum b/devel/libtool/files/patch-sum
index 5e1e60ab8d8..c2e02aa977e 100644
--- a/devel/libtool/files/patch-sum
+++ b/devel/libtool/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.27 2001/02/28 10:16:58 skrll Exp $
+$NetBSD: patch-sum,v 1.28 2001/02/28 18:18:22 skrll Exp $
 
 MD5 (patch-aa) = fb45156202da4751206e36dd0be5dabc
-MD5 (patch-ab) = abd3b34a1f88b017bc43a598327feee9
+MD5 (patch-ab) = 8bc16291ef6407e694ecdccb103bae5d
 MD5 (patch-ac) = a5da475693a57e16bd8462793f87639e
-MD5 (patch-ad) = f715e7126f5dd7fdece8d61045c74100
+MD5 (patch-ad) = 15958457a2ed12613b9ad901677772d3
 MD5 (patch-ae) = 70312d73e1108c7f97ecf56db2e87ad8
 MD5 (patch-af) = cee79627cf58e02ceb2ea483fd3c044c
 MD5 (patch-ag) = abc7ae8960f4b1019a3278fb27d8be23
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 33f744264f5..19fbbb0a007 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,20 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $
+$NetBSD: patch-ab,v 1.18 2001/02/28 18:18:23 skrll Exp $
 
---- ltmain.sh.orig	Mon Feb 19 05:05:23 2001
+--- ltmain.sh.orig	Wed Feb 28 17:56:25 2001
 +++ ltmain.sh
-@@ -508,9 +508,8 @@
-         # was found and let the user know that the "--tag" command
-         # line option must be used.
-         if test -z "$tagname"; then
--          echo "$modename: unable to infer tagged configuration"
--          echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+          echo "$modename: warning: unable to infer tagged configuration" 1>&2
-+          echo "$modename: warning: using the default" 1>&2
- #        else
- #          echo "$modename: using $tagname tagged configuration"
-         fi
-@@ -946,7 +945,6 @@
+@@ -946,7 +946,6 @@
  	  continue
  	  ;;
  	release)
@@ -22,19 +10,7 @@ $NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $
  	  prev=
  	  continue
  	  ;;
-@@ -1447,9 +1445,8 @@
-         # was found and let the user know that the "--tag" command
-         # line option must be used.
-         if test -z "$tagname"; then
--          echo "$modename: unable to infer tagged configuration"
--          echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit 1
-+          echo "$modename: warning: unable to infer tagged configuration"
-+          echo "$modename: warning: using the default" 1>&2
- #       else
- #         echo "$modename: using $tagname tagged configuration"
-         fi
-@@ -2397,7 +2394,7 @@
+@@ -2397,7 +2396,7 @@
  
  	# Check that each of the things are valid numbers.
  	case "$current" in
@@ -43,7 +19,7 @@ $NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $
  	*)
  	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2406,7 +2403,7 @@
+@@ -2406,7 +2405,7 @@
  	esac
  
  	case "$revision" in
@@ -52,7 +28,7 @@ $NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $
  	*)
  	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2415,7 +2412,7 @@
+@@ -2415,7 +2414,7 @@
  	esac
  
  	case "$age" in
@@ -61,7 +37,7 @@ $NetBSD: patch-ab,v 1.17 2001/02/28 10:16:58 skrll Exp $
  	*)
  	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
  	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-@@ -2612,6 +2609,9 @@
+@@ -2612,6 +2611,9 @@
  	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
  	    # these systems don't actually have a c library (as such)!
  	    ;;
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index 65338be376d..02cccb8f93b 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2001/02/27 08:20:25 skrll Exp $
+$NetBSD: patch-ad,v 1.3 2001/02/28 18:18:23 skrll Exp $
 
---- Makefile.in.orig	Thu Feb  8 05:07:13 2001
+--- Makefile.in.orig	Mon Feb 19 05:06:14 2001
 +++ Makefile.in
 @@ -93,7 +93,7 @@
  
@@ -11,3 +11,21 @@ $NetBSD: patch-ad,v 1.2 2001/02/27 08:20:25 skrll Exp $
  SUBDIRS = $(BUILD_SUBDIRS)
  DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
  
+@@ -476,6 +476,17 @@
+ 	file_magic_cmd="$(file_magic_cmd)" \
+ 	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
+ 	  --output=$@T $(srcdir)/ltmain.sh $(host_triplet)
++	AR="$(AR)" CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
++	LTCC="$(CC)" FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
++	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
++	STRIP="$(STRIP)" AS="$(AS)" DLLTOOL="$(DLLTOOL)" \
++	OBJDUMP="$(OBJDUMP)" \
++	objext="$(OBJEXT)" exeext="$(EXEEXT)" \
++	reload_flag="$(reload_flag)" \
++	deplibs_check_method="$(deplibs_check_method)" \
++	file_magic_cmd="$(file_magic_cmd)" \
++	$(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
++	  --add-tag=CC --output=$@T $(srcdir)/ltcf-c.sh $(host_triplet)
+ @HAVE_CXX_TRUE@	AR="$(AR)" CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ @HAVE_CXX_TRUE@	LTCC="$(CC)" FILE="$(FILE)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
+ @HAVE_CXX_TRUE@	LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \