| 1 |
mabi 12/03/04 22:58:29 |
| 2 |
|
| 3 |
Added: lua.pc configure.in lua-5.2-make.patch |
| 4 |
Log: |
| 5 |
version bump (bug #395057). also now uses local libtool (bug #336167) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-lang/lua/files/lua.pc |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua.pc?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua.pc?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lua.pc |
| 16 |
=================================================================== |
| 17 |
# lua.pc -- pkg-config data for Lua |
| 18 |
|
| 19 |
# vars from install Makefile |
| 20 |
|
| 21 |
# grep '^V=' ../Makefile |
| 22 |
V= 5.1 |
| 23 |
# grep '^R=' ../Makefile |
| 24 |
R= 5.1.4 |
| 25 |
|
| 26 |
# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' |
| 27 |
prefix= /usr |
| 28 |
INSTALL_BIN= ${prefix}/bin |
| 29 |
INSTALL_INC= ${prefix}/include |
| 30 |
INSTALL_LIB= ${prefix}/,lib, |
| 31 |
INSTALL_MAN= ${prefix}/man/man1 |
| 32 |
INSTALL_LMOD= ${prefix}/share/lua/${V} |
| 33 |
INSTALL_CMOD= ${prefix}/,lib,/lua/${V} |
| 34 |
|
| 35 |
# canonical vars |
| 36 |
exec_prefix=${prefix} |
| 37 |
libdir=${exec_prefix}/,lib, |
| 38 |
includedir=${prefix}/include |
| 39 |
|
| 40 |
Name: Lua |
| 41 |
Description: An Extensible Extension Language |
| 42 |
Version: ${R} |
| 43 |
Requires: |
| 44 |
Libs: -L${libdir} -llua -lm |
| 45 |
Cflags: -I${includedir} |
| 46 |
|
| 47 |
# (end of lua.pc) |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
1.1 dev-lang/lua/files/configure.in |
| 52 |
|
| 53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/configure.in?rev=1.1&view=markup |
| 54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/configure.in?rev=1.1&content-type=text/plain |
| 55 |
|
| 56 |
Index: configure.in |
| 57 |
=================================================================== |
| 58 |
top_buildir=. |
| 59 |
|
| 60 |
AC_INIT(src/luaconf.h) |
| 61 |
AC_PROG_LIBTOOL |
| 62 |
AC_OUTPUT() |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
1.1 dev-lang/lua/files/lua-5.2-make.patch |
| 67 |
|
| 68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.2-make.patch?rev=1.1&view=markup |
| 69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/lua/files/lua-5.2-make.patch?rev=1.1&content-type=text/plain |
| 70 |
|
| 71 |
Index: lua-5.2-make.patch |
| 72 |
=================================================================== |
| 73 |
--- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200 |
| 74 |
+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100 |
| 75 |
@@ -127,3 +127,18 @@ |
| 76 |
.PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer |
| 77 |
|
| 78 |
# (end of Makefile) |
| 79 |
+ |
| 80 |
+# Use libtool for binary installs, etc. |
| 81 |
+ |
| 82 |
+export V |
| 83 |
+export LIBTOOL = ../libtool --quiet --tag=CC |
| 84 |
+# See libtool manual about how to set this |
| 85 |
+ |
| 86 |
+gentoo_clean: |
| 87 |
+ cd src; $(MAKE) $@ |
| 88 |
+ |
| 89 |
+gentoo_install: |
| 90 |
+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) |
| 91 |
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN) |
| 92 |
+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) |
| 93 |
+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB) |
| 94 |
--- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100 |
| 95 |
+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100 |
| 96 |
@@ -54,1 +54,1 @@ |
| 97 |
-$(LUA_T): $(LUA_O) $(LUA_A) |
| 98 |
+origin$(LUA_T): $(LUA_O) $(LUA_A) |
| 99 |
@@ -57,1 +57,1 @@ |
| 100 |
-$(LUAC_T): $(LUAC_O) $(LUA_A) |
| 101 |
+origin$(LUAC_T): $(LUAC_O) $(LUA_A) |
| 102 |
@@ -185,3 +185,30 @@ |
| 103 |
lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \ |
| 104 |
lzio.h |
| 105 |
|
| 106 |
+ |
| 107 |
+export LIBTOOL = ../libtool --quiet --tag=CC |
| 108 |
+export LIB_VERSION = 6:1:1 |
| 109 |
+ |
| 110 |
+# The following rules use libtool for compiling and linking in order to |
| 111 |
+# provide shared library support. |
| 112 |
+ |
| 113 |
+LIB_NAME = liblua.la |
| 114 |
+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo) |
| 115 |
+ |
| 116 |
+%.lo %.o: %.c |
| 117 |
+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< |
| 118 |
+ |
| 119 |
+$(LIB_NAME): $(LIB_OBJS) |
| 120 |
+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \ |
| 121 |
+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS) |
| 122 |
+ |
| 123 |
+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME) |
| 124 |
+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS) |
| 125 |
+ |
| 126 |
+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 127 |
+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME) |
| 128 |
+ |
| 129 |
+gentoo_clean: |
| 130 |
+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac |
| 131 |
+ |
| 132 |
+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T) |
Archives