exactly set --mode and --tag for libtool.

3 files changed, 25 insertions, 25 deletions

diff --git a/devel/stlport/distinfo b/devel/stlport/distinfo
index 8be62d4bb79..6492a6d8b79 100644
--- a/devel/stlport/distinfo
+++ b/devel/stlport/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.8 2005/02/23 22:24:34 agc Exp $
+$NetBSD: distinfo,v 1.9 2010/09/26 11:27:21 obache Exp $
 
 SHA1 (STLport-4.6.tar.gz) = 55401b648bebc0b7b6b4e3d7b4e420d22c358af9
 RMD160 (STLport-4.6.tar.gz) = da9d53334eebed285b096acc9d5e806395926f00
 Size (STLport-4.6.tar.gz) = 756708 bytes
-SHA1 (patch-aa) = 9fb8af22933c925393bdcfb60988d100822501d7
+SHA1 (patch-aa) = 16b309bcbede9dbd2595c90c1d8193238c0414ab
 SHA1 (patch-aj) = 67dd73dcf5a41dd2da38e58363a05f7f54709124
 SHA1 (patch-ak) = ce55c80bc369bf9a8c20d751293197b71fbf4ed8
-SHA1 (patch-al) = d8331d464c810ea8cdeba5cb3fe1e34dea707761
+SHA1 (patch-al) = db8f177fb55fa1f41f4bd67b988b2f3ae6220fd6
 SHA1 (patch-am) = 01a50206ec73f482c1e2ed7fee2733d7f422de5a
diff --git a/devel/stlport/patches/patch-aa b/devel/stlport/patches/patch-aa
index aade90c03de..b930f22d619 100644
--- a/devel/stlport/patches/patch-aa
+++ b/devel/stlport/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2004/11/12 06:39:20 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2010/09/26 11:27:21 obache Exp $
 
 --- src/gcc-libtool.mak.orig	2004-01-04 10:44:33.000000000 +0100
 +++ src/gcc-libtool.mak
@@ -23,9 +23,9 @@ $NetBSD: patch-aa,v 1.5 2004/11/12 06:39:20 jlam Exp $
 +# guts for common stuff
 +#
 +#
-+LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -o
++LINK=$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o
 +# 2.95 flag
-+DYN_LINK=$(LIBTOOL) $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
++DYN_LINK=$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -shared -o
 +
 +OBJEXT=lo
 +DYNEXT=la
diff --git a/devel/stlport/patches/patch-al b/devel/stlport/patches/patch-al
index 9498e8f6151..4b8df612614 100644
--- a/devel/stlport/patches/patch-al
+++ b/devel/stlport/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2004/01/05 22:14:19 mrauch Exp $
+$NetBSD: patch-al,v 1.2 2010/09/26 11:27:21 obache Exp $
 
 --- src/common_percent_rules.mak.orig	2001-09-30 22:11:31.000000000 +0200
 +++ src/common_percent_rules.mak
@@ -11,71 +11,71 @@ $NetBSD: patch-al,v 1.1 2004/01/05 22:14:19 mrauch Exp $
 -$(RELEASE_OBJDIR_static)/%.o: %.c
 -	$(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
 +$(RELEASE_OBJDIR_static)/%.lo: %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_RELEASE_static) $< -c -o $@
 +$(RELEASE_OBJDIR_static)/%.lo: %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CC) $(CXXFLAGS_RELEASE_static) $< -c -o $@
  $(RELEASE_OBJDIR_static)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_static) $< -E  $@
++	$(LIBTOOL) $(CXX) --mode=compile --tag=CXX $(CXXFLAGS_RELEASE_static) $< -E  $@
  
 -$(RELEASE_OBJDIR_dynamic)/%.o : %.cpp
 -	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
 -$(RELEASE_OBJDIR_dynamic)/%.o : %.c
 -	$(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
 +$(RELEASE_OBJDIR_dynamic)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
 +$(RELEASE_OBJDIR_dynamic)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile TAG=CC $(CC) $(CXXFLAGS_RELEASE_dynamic) $< -c -o $@
  $(RELEASE_OBJDIR_dynamic)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_RELEASE_dynamic) $< -E  $@
  
 -$(DEBUG_OBJDIR_static)/%.o : %.cpp
 -	$(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
 -$(DEBUG_OBJDIR_static)/%.o : %.c
 -	$(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
 +$(DEBUG_OBJDIR_static)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_DEBUG_static) $< -c -o $@
 +$(DEBUG_OBJDIR_static)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile TAG=CC $(CC) $(CXXFLAGS_DEBUG_static) $< -c -o $@
  $(DEBUG_OBJDIR_static)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_DEBUG_static) $< -E  $@
  
 -$(DEBUG_OBJDIR_dynamic)/%.o : %.cpp
 -	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
 -$(DEBUG_OBJDIR_dynamic)/%.o : %.c
 -	$(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
 +$(DEBUG_OBJDIR_dynamic)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
 +$(DEBUG_OBJDIR_dynamic)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile TAG=CC $(CC) $(CXXFLAGS_DEBUG_dynamic) $< -c -o $@
  $(DEBUG_OBJDIR_dynamic)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_DEBUG_dynamic) $< -E  $@
  
 -$(STLDEBUG_OBJDIR_static)/%.o : %.cpp
 -	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
 -$(STLDEBUG_OBJDIR_static)/%.o : %.c
 -	$(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
 +$(STLDEBUG_OBJDIR_static)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
 +$(STLDEBUG_OBJDIR_static)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
++	$(LIBTOOL) --mode=compile TAG=CC $(CC) $(CXXFLAGS_STLDEBUG_static) $< -c -o $@
  $(STLDEBUG_OBJDIR_static)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_STLDEBUG_static) $< -E  $@
  
 -$(STLDEBUG_OBJDIR_dynamic)/%.o : %.cpp
 -	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
 -$(STLDEBUG_OBJDIR_dynamic)/%.o : %.c
 -	$(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
 +$(STLDEBUG_OBJDIR_dynamic)/%.lo : %.cpp
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
 +$(STLDEBUG_OBJDIR_dynamic)/%.lo : %.c
-+	$(LIBTOOL) $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
++	$(LIBTOOL) --mode=compile TAG=CC $(CC) $(CXXFLAGS_STLDEBUG_dynamic) $< -c -o $@
  $(STLDEBUG_OBJDIR_dynamic)/%.i : %.cpp
 -	$(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
-+	$(LIBTOOL) $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CXXFLAGS_STLDEBUG_dynamic) $< -E  $@