Date: Tuesday, April 10, 2012 @ 15:55:54 Author: bluewind Revision: 155985
upgpkg: lua 5.1.5-2 change shared library name to liblua.so.5.1.5 and library soname to liblua.so.5.1 .so.5.1 because lua 5.1 is not compatible with 5.2 Modified: lua/trunk/PKGBUILD lua/trunk/lua-arch.patch ----------------+ PKGBUILD | 8 +++---- lua-arch.patch | 57 ++++++++++++++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-10 18:41:29 UTC (rev 155984) +++ PKGBUILD 2012-04-10 19:55:54 UTC (rev 155985) @@ -4,7 +4,7 @@ pkgname=lua pkgver=5.1.5 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful light-weight programming language designed for extending applications" arch=('i686' 'x86_64') url="http://www.lua.org/" @@ -14,7 +14,7 @@ source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz lua-arch.patch lua-5.1-cflags.diff) md5sums=('2e115fe26e435e33b0d5c022e4490567' - '6c5953f63904bf20a0183cdab05b80de' + 'fa25feb70ef9fec975b1c20da5098b3c' '249582bf1fd861ccf492d2c35a9fe732') build() { @@ -23,14 +23,14 @@ patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" export CFLAGS="$CFLAGS -fPIC" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ linux } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ + make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.$pkgver" \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ install install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" Modified: lua-arch.patch =================================================================== --- lua-arch.patch 2012-04-10 18:41:29 UTC (rev 155984) +++ lua-arch.patch 2012-04-10 19:55:54 UTC (rev 155985) @@ -1,8 +1,7 @@ -diff -ur lua-5.1.orig/etc/lua.pc lua-5.1/etc/lua.pc ---- lua-5.1.orig/etc/lua.pc 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/etc/lua.pc 2006-03-21 11:52:05.000000000 +0100 -@@ -6,7 +6,7 @@ - V= 5.1 +diff -ur lua-5.1.4/etc/lua.pc lua-5.1.4-new/etc/lua.pc +--- lua-5.1.4/etc/lua.pc 2008-08-08 14:46:11.000000000 +0200 ++++ lua-5.1.4-new/etc/lua.pc 2012-02-23 18:25:34.000000000 +0100 +@@ -8,6 +8,6 @@ # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -prefix= /usr/local @@ -10,11 +9,23 @@ INSTALL_BIN= ${prefix}/bin INSTALL_INC= ${prefix}/include INSTALL_LIB= ${prefix}/lib -diff -ur lua-5.1.orig/src/Makefile lua-5.1/src/Makefile ---- lua-5.1.orig/src/Makefile 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/Makefile 2006-03-21 11:52:09.000000000 +0100 +diff -ur lua-5.1.4/src/luaconf.h lua-5.1.4-new/src/luaconf.h +--- lua-5.1.4/src/luaconf.h 2008-02-11 17:25:08.000000000 +0100 ++++ lua-5.1.4-new/src/luaconf.h 2012-02-23 18:25:34.000000000 +0100 +@@ -94,7 +94,7 @@ + ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + + #else +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/5.1/" + #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" + #define LUA_PATH_DEFAULT \ +diff -ur lua-5.1.4/src/Makefile lua-5.1.4-new/src/Makefile +--- lua-5.1.4/src/Makefile 2008-01-19 20:37:58.000000000 +0100 ++++ lua-5.1.4-new/src/Makefile 2012-02-23 18:26:43.000000000 +0100 @@ -23,6 +23,7 @@ - PLATS= aix ansi bsd generic linux macosx mingw posix solaris + PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so @@ -30,26 +41,26 @@ ALL_A= $(LUA_A) default: $(PLAT) -@@ -51,6 +52,10 @@ +@@ -51,6 +52,11 @@ $(AR) $@ $? $(RANLIB) $@ +$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,liblua.so -o $@.5.1 $? -lm $(MYLDFLAGS) -+ ln -s $@.5.1 $@ ++ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) + $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -diff -ur lua-5.1.orig/src/luaconf.h lua-5.1/src/luaconf.h ---- lua-5.1.orig/src/luaconf.h 2006-03-21 11:51:53.000000000 +0100 -+++ lua-5.1/src/luaconf.h 2006-03-21 11:52:05.000000000 +0100 -@@ -82,7 +82,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" +--- lua-5.1.4/Makefile 2008-08-12 02:40:48.000000000 +0200 ++++ lua-5.1.4-new/Makefile 2012-02-23 19:06:32.000000000 +0100 +@@ -53,7 +53,7 @@ + all: $(PLAT) - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) $@ V=$(V) R=$(R) + + test: dummy + src/lua test/hello.lua