From 229a610db94833f7ad9cb339d6a43e143ce1ca22 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Thu, 17 Dec 2009 16:42:45 +0000
Subject: Fix build with new libtool by specifying --tag=CC in all calls.

---
 lang/lua/distinfo         |  6 +++---
 lang/lua/patches/patch-aa | 18 +++++++++---------
 lang/lua/patches/patch-ab | 14 +++++++-------
 3 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'lang')

diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index ecea5b1fba5..fac9e5c553c 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2009/10/30 18:34:56 ahoka Exp $
+$NetBSD: distinfo,v 1.25 2009/12/17 16:42:45 jmmv Exp $
 
 SHA1 (lua-5.1.4.tar.gz) = 2b11c8e60306efb7f0734b747588f57995493db7
 RMD160 (lua-5.1.4.tar.gz) = c867c8364295d3e4fb4e4d8ebb27fa2b2312cdef
 Size (lua-5.1.4.tar.gz) = 216679 bytes
-SHA1 (patch-aa) = 28b7564fe8fd43d84fb48d74ec14f301dc9615a0
-SHA1 (patch-ab) = 256828d21e380217a8178c4ca46ec1edc23cd53f
+SHA1 (patch-aa) = 25bcd22d3fc319c51356b7f976d0215eb04900db
+SHA1 (patch-ab) = c5d35cbef2be7c3e2d41209c6656beacc0aa0415
 SHA1 (patch-ac) = 9e882a3fd420a45ab4ac0dca55d1b2fac46eb7de
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 3b0cbd4810a..4adb5b24342 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
+$NetBSD: patch-aa,v 1.19 2009/12/17 16:42:46 jmmv Exp $
 
---- Makefile.orig	Tue Aug 12 01:40:48 2008
-+++ Makefile	Tue Jan 20 16:27:31 2009
-@@ -9,11 +9,11 @@
+--- Makefile.orig	2008-08-12 01:40:48.000000000 +0100
++++ Makefile	2009-12-17 16:36:32.000000000 +0000
+@@ -9,11 +9,11 @@ PLAT= none
  
  # Where to install. The installation starts in the src and doc directories,
  # so take care if INSTALL_TOP is not an absolute path.
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
  #
  # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
  # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h (and also with etc/lua.pc).
-@@ -24,7 +24,7 @@
+@@ -24,7 +24,7 @@ INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
  # may have to run ranlib on the installed liblua.a (do "make ranlib").
  INSTALL= install -p
  INSTALL_EXEC= $(INSTALL) -m 0755
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
  #
  # If you don't have install you can use cp instead.
  # INSTALL= cp -p
-@@ -43,7 +43,7 @@
+@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linu
  # What to install.
  TO_BIN= lua luac
  TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
  TO_MAN= lua.1 luac.1
  
  # Lua version and release.
-@@ -59,11 +59,11 @@
+@@ -59,11 +59,11 @@ test:	dummy
  	src/lua test/hello.lua
  
  install: dummy
@@ -44,9 +44,9 @@ $NetBSD: patch-aa,v 1.18 2009/01/20 16:30:39 sketch Exp $
 -	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
 -	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
 +	cd src && $(MKDIR) $(DESTDIR)$(INSTALL_BIN) $(DESTDIR)$(INSTALL_INC) $(DESTDIR)$(INSTALL_LIB) $(DESTDIR)$(INSTALL_MAN) $(DESTDIR)$(INSTALL_LMOD) $(DESTDIR)$(INSTALL_CMOD)
-+	cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
++	cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_PROGRAM) $(TO_BIN) $(DESTDIR)$(INSTALL_BIN)
 +	cd src && $(INSTALL_DATA) $(TO_INC) $(DESTDIR)$(INSTALL_INC)
-+	cd src && $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
++	cd src && $(LIBTOOL) --tag=CC --mode=install $(BSD_INSTALL_LIB) $(TO_LIB) $(DESTDIR)$(INSTALL_LIB)
 +	cd doc && $(INSTALL_DATA) $(TO_MAN) $(DESTDIR)$(INSTALL_MAN)
  
  ranlib:
diff --git a/lang/lua/patches/patch-ab b/lang/lua/patches/patch-ab
index f76bfc89e7b..a7f97428e72 100644
--- a/lang/lua/patches/patch-ab
+++ b/lang/lua/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.11 2009/10/30 18:34:56 ahoka Exp $
+$NetBSD: patch-ab,v 1.12 2009/12/17 16:42:46 jmmv Exp $
 
---- src/Makefile.orig	2008-01-19 20:37:58.000000000 +0100
-+++ src/Makefile
+--- src/Makefile.orig	2008-01-19 19:37:58.000000000 +0000
++++ src/Makefile	2009-12-17 16:36:51.000000000 +0000
 @@ -7,8 +7,8 @@
  # Your platform. See PLATS for possible values.
  PLAT= none
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.11 2009/10/30 18:34:56 ahoka Exp $
  
 +.SUFFIXES:	.lo
 +.c.lo:
-+	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CFLAGS) -c $<
 +LV=	5:1
 +
  # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
@@ -57,15 +57,15 @@ $NetBSD: patch-ab,v 1.11 2009/10/30 18:34:56 ahoka Exp $
  $(LUA_A): $(CORE_O) $(LIB_O)
 -	$(AR) $@ $?
 -	$(RANLIB) $@
-+	${LIBTOOL} --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} -o $@ ${CORE_O} ${LIB_O} -rpath ${PREFIX}/lib -version-info ${LV} ${LIBS}
  
  $(LUA_T): $(LUA_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+	${LIBTOOL} --mode=link $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --tag=CC --mode=link $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
  
  $(LUAC_T): $(LUAC_O) $(LUA_A)
 -	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+	${LIBTOOL} --mode=link $(CC) -static -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++	${LIBTOOL} --tag=CC --mode=link $(CC) -static -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
  
  clean:
  	$(RM) $(ALL_T) $(ALL_O)
-- 
cgit v1.2.3