[pkgsrc/trunk]: pkgsrc/lang/lua - don't hardcode CC=gcc

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dced4e91677b
branches:  trunk
changeset: 476498:dced4e91677b
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jun 12 03:01:59 2004 +0000

description:
- don't hardcode CC=gcc
- don't hardcode RANLIB=ranlib
- don't pass gcc specific -W flags
- needs -ldl on Solaris

diffstat:

 lang/lua/Makefile         |   5 ++++-
 lang/lua/distinfo         |   4 ++--
 lang/lua/patches/patch-aa |  26 +++++++++++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diffs (82 lines):

diff -r c66ea1f8ae8d -r dced4e91677b lang/lua/Makefile
--- a/lang/lua/Makefile Sat Jun 12 02:50:46 2004 +0000
+++ b/lang/lua/Makefile Sat Jun 12 03:01:59 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/05 14:54:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/06/12 03:01:59 grant Exp $
 
 DISTNAME=      lua-5.0.2
 CATEGORIES=    lang
@@ -23,6 +23,9 @@
 ALL_TARGET=    all so
 INSTALL_TARGET=        install soinstall
 
+LIBS.SunOS+=   -ldl
+MAKE_ENV+=     LIBS="${LIBS}"
+
 post-build:
        cd ${WRKSRC}/etc && ${MAKE} bin2c
 
diff -r c66ea1f8ae8d -r dced4e91677b lang/lua/distinfo
--- a/lang/lua/distinfo Sat Jun 12 02:50:46 2004 +0000
+++ b/lang/lua/distinfo Sat Jun 12 03:01:59 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/05/02 17:40:27 xtraeme Exp $
+$NetBSD: distinfo,v 1.8 2004/06/12 03:01:59 grant Exp $
 
 SHA1 (lua-5.0.2.tar.gz) = a200cfd20a9a4c7da1206ae45dddf26186a9e0e7
 Size (lua-5.0.2.tar.gz) = 190442 bytes
-SHA1 (patch-aa) = 101e3e1700ceae6c6574e1fbdfec0ce3359c775e
+SHA1 (patch-aa) = 5fd7d380a3171eaed37039e649a50f7bf2725e14
 SHA1 (patch-ab) = 788834909e1b1ef990805c334071d9ad8761c36f
diff -r c66ea1f8ae8d -r dced4e91677b lang/lua/patches/patch-aa
--- a/lang/lua/patches/patch-aa Sat Jun 12 02:50:46 2004 +0000
+++ b/lang/lua/patches/patch-aa Sat Jun 12 03:01:59 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.6 2004/05/02 17:40:27 xtraeme Exp $
+$NetBSD: patch-aa,v 1.7 2004/06/12 03:01:59 grant Exp $
 
---- config.orig        Fri Apr 11 14:00:41 2003
+--- config.orig        2003-04-12 00:00:41.000000000 +1000
 +++ config
 @@ -25,7 +25,7 @@ USERCONF=
  # interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others),
@@ -20,6 +20,17 @@
  
  # ------------------------------------------------------------- Lua interpreter
  
+@@ -108,8 +108,8 @@ EXTRA_LIBS= -lm
+ # You need an ANSI C compiler. gcc is a popular one. We do not use -ansi in
+ # WARN because it disables POSIX features used in the libraries.
+ #
+-CC= gcc
+-WARN= -Wall
++# CC= gcc
++# WARN= -Wall
+ 
+ # ------------------------------------------------------------------ C options
+ 
 @@ -119,11 +119,11 @@ WARN= -Wall
  # debug information. If you only want the shared libraries, you may want to
  # add -fPIC to MYCFLAGS.
@@ -30,10 +41,19 @@
  
  # Write here any options you may need for your C linker.
 -#MYLDFLAGS=
-+MYLDFLAGS= $(LDFLAGS) -Wl,-E
++MYLDFLAGS= $(LDFLAGS) $(LIBS) # -Wl,-E
  
  # ------------------------------------------------------------------ librarian
  
+@@ -134,7 +134,7 @@ AR= ar rcu
+ # If your system doesn't have (or need) ranlib, use RANLIB=true.
+ # On some systems, "ar s" does what ranlib would do.
+ #
+-RANLIB= ranlib
++# RANLIB= ranlib
+ #RANLIB= ar s
+ #RANLIB= true
+ 
 @@ -148,7 +148,7 @@ STRIP= strip
  
  # Locations for "make install". You may need to be root do "make install".