diff options
| author | rillig <rillig@pkgsrc.org> | 2006-06-01 06:52:27 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-06-01 06:52:27 +0000 |
| commit | d88850feaa2cbef5714df47765a146c415ab3c0b (patch) | |
| tree | 2d4c75f669de7b6ad8aae97f189996483ebd9506 /lang/lua/patches | |
| parent | 56fb8d7ce59126d26f3341aebd16637b55ee8c21 (diff) | |
| download | pkgsrc-d88850feaa2cbef5714df47765a146c415ab3c0b.tar.gz | |
On Linux, -ldl must be included into the libtool archive to make other
packages work, for example games/fillet-ng. This fixes PR 31171.
Bumped PKGREVISION.
Diffstat (limited to 'lang/lua/patches')
| -rw-r--r-- | lang/lua/patches/patch-aa | 15 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ac | 15 | ||||
| -rw-r--r-- | lang/lua/patches/patch-ad | 15 |
3 files changed, 28 insertions, 17 deletions
diff --git a/lang/lua/patches/patch-aa b/lang/lua/patches/patch-aa index 2e1429555c3..9c17a5b6aec 100644 --- a/lang/lua/patches/patch-aa +++ b/lang/lua/patches/patch-aa @@ -1,7 +1,16 @@ -$NetBSD: patch-aa,v 1.10 2006/05/26 18:29:27 reed Exp $ +$NetBSD: patch-aa,v 1.11 2006/06/01 06:52:28 rillig Exp $ ---- config.orig 2003-04-11 07:00:41.000000000 -0700 -+++ config 2006-05-26 11:22:14.000000000 -0700 +--- config.orig 2003-04-11 15:00:41.000000000 +0100 ++++ config 2006-06-01 07:40:42.963818821 +0100 +@@ -4,7 +4,7 @@ + # These are default values. Skip this section and see the explanations below. + + LOADLIB= +-DLLIB= ++#DLLIB= + NUMBER= + POPEN= + TMPNAM= @@ -25,7 +25,7 @@ USERCONF= # interface (e.g., Linux, Solaris, IRIX, BSD, AIX, HPUX, and probably others), # uncomment the next two lines. diff --git a/lang/lua/patches/patch-ac b/lang/lua/patches/patch-ac index f0817e4dab3..128429c7857 100644 --- a/lang/lua/patches/patch-ac +++ b/lang/lua/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2006/06/01 06:52:28 rillig Exp $ ---- src/Makefile.orig Fri Dec 13 12:12:11 2002 -+++ src/Makefile +--- src/Makefile.orig 2002-12-13 12:12:11.000000000 +0000 ++++ src/Makefile 2006-06-01 07:25:02.604386400 +0100 @@ -26,6 +26,8 @@ OBJS= \ lvm.o \ lzio.o @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $ SRCS= \ lapi.c \ lcode.c \ -@@ -68,12 +70,16 @@ SRCS= \ +@@ -68,13 +70,17 @@ SRCS= \ lzio.h T= $(LIB)/liblua.a @@ -23,9 +23,10 @@ $NetBSD: patch-ac,v 1.4 2005/09/04 04:59:36 jlam Exp $ $T: $(OBJS) $(AR) $@ $(OBJS) $(RANLIB) $@ -+ -+$(LT): $(LOBJS) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) ++$(LT): $(LOBJS) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB) ++ clean: rm -f $(OBJS) $T + diff --git a/lang/lua/patches/patch-ad b/lang/lua/patches/patch-ad index 3bab482670e..b6104def4f2 100644 --- a/lang/lua/patches/patch-ad +++ b/lang/lua/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.4 2005/09/04 04:59:36 jlam Exp $ +$NetBSD: patch-ad,v 1.5 2006/06/01 06:52:28 rillig Exp $ ---- src/lib/Makefile.orig Fri Mar 28 12:49:56 2003 -+++ src/lib/Makefile -@@ -7,15 +7,20 @@ include $(LUA)/config +--- src/lib/Makefile.orig 2003-03-28 12:49:56.000000000 +0000 ++++ src/lib/Makefile 2006-06-01 07:25:02.631381504 +0100 +@@ -7,16 +7,21 @@ include $(LUA)/config EXTRA_DEFS= $(POPEN) $(TMPNAM) $(DEGREES) $(LOADLIB) OBJS= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o ltablib.o lstrlib.o loadlib.o @@ -18,9 +18,10 @@ $NetBSD: patch-ad,v 1.4 2005/09/04 04:59:36 jlam Exp $ $T: $(OBJS) $(AR) $@ $(OBJS) $(RANLIB) $@ -+ -+$(LT): $(LOBJS) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) ++$(LT): $(LOBJS) ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) -rpath $(INSTALL_LIB) -version-info $(LV) $(DLLIB) ++ clean: rm -f $(OBJS) $T + |