summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-06-12 03:01:59 +0000
committergrant <grant@pkgsrc.org>2004-06-12 03:01:59 +0000
commit7e2c2c6d0eb25b8e08ce1d380ccfa70af586a840 (patch)
treed9b6b47914d25e28b32b29687c5b71c183dc5cfb /lang
parent0a828593c350dd6d5b7500eff89d0d04f9cde268 (diff)
downloadpkgsrc-7e2c2c6d0eb25b8e08ce1d380ccfa70af586a840.tar.gz
- don't hardcode CC=gcc
- don't hardcode RANLIB=ranlib - don't pass gcc specific -W flags - needs -ldl on Solaris
Diffstat (limited to 'lang')
-rw-r--r--lang/lua/Makefile5
-rw-r--r--lang/lua/distinfo4
-rw-r--r--lang/lua/patches/patch-aa26
3 files changed, 29 insertions, 6 deletions
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index 58bb9bca054..1ba83b2a88b 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -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 @@ USE_BUILDLINK3= yes
ALL_TARGET= all so
INSTALL_TARGET= install soinstall
+LIBS.SunOS+= -ldl
+MAKE_ENV+= LIBS="${LIBS}"
+
post-build:
cd ${WRKSRC}/etc && ${MAKE} bin2c
diff --git a/lang/lua/distinfo b/lang/lua/distinfo
index 9539c754269..2ea652c1e88 100644
--- a/lang/lua/distinfo
+++ b/lang/lua/distinfo
@@ -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 --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa
index 2776cb68a42..cd85532d66c 100644
--- a/lang/lua/patches/patch-aa
+++ b/lang/lua/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.6 2004/05/02 17:40:27 xtraeme Exp $
# ------------------------------------------------------------- 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 @@ $NetBSD: patch-aa,v 1.6 2004/05/02 17:40:27 xtraeme Exp $
# 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".