Ticket #18402: patch-lua-#18402-1.diff
File patch-lua-#18402-1.diff, 5.5 KB (added by anddam (Andrea D'Amore), 14 years ago) |
---|
-
files/patch-Makefile.diff
1 --- Makefile.orig 2011-03-27 16:49:40.000000000 +0200 2 +++ Makefile 2011-03-27 16:52:46.000000000 +0200 3 @@ -43,7 +43,7 @@ 4 # What to install. 5 TO_BIN= lua luac 6 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp 7 -TO_LIB= liblua.a 8 +TO_LIB= liblua.a liblua.dylib 9 TO_MAN= lua.1 luac.1 10 11 # Lua version and release. 12 @@ -64,6 +64,10 @@ 13 cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) 14 cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) 15 cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) 16 + cd $(INSTALL_LIB) && sudo ln -s liblua.a liblua.%VERSION%.a 17 + cd $(INSTALL_LIB) && sudo ln -s liblua.a liblua.%COMPAT_VERSION%.a 18 + cd $(INSTALL_LIB) && sudo ln -s liblua.dylib liblua.%VERSION%.dylib 19 + cd $(INSTALL_LIB) && sudo ln -s liblua.dylib liblua.%COMPAT_VERSION%.dylib 20 21 ranlib: 22 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) -
files/patch-dlopen.diff
1 --- Makefile.orig 2008-08-11 19:40:48.000000000 -05002 +++ Makefile 2011-03-19 23:15:33.000000000 -05003 @@ -43,7 +43,7 @@4 # What to install.5 TO_BIN= lua luac6 TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp7 -TO_LIB= liblua.a8 +TO_LIB= liblua.%VERSION%.dylib9 TO_MAN= lua.1 luac.110 11 # Lua version and release.12 @@ -64,6 +64,8 @@13 cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)14 cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)15 cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)16 + cd $(INSTALL_LIB) && sudo ln -s liblua.%VERSION%.dylib liblua.dylib17 + cd $(INSTALL_LIB) && sudo ln -s liblua.%VERSION%.dylib liblua.%COMPAT_VERSION%.dylib18 19 ranlib:20 cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)21 --- src/Makefile.orig 2008-01-19 13:37:58.000000000 -060022 +++ src/Makefile 2011-03-19 23:17:58.000000000 -050023 @@ -22,7 +22,7 @@24 25 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris26 27 -LUA_A= liblua.a28 +LUA_A= liblua.%VERSION%.dylib29 CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \30 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \31 lundump.o lvm.o lzio.o32 @@ -50,9 +50,11 @@33 $(LUA_A): $(CORE_O) $(LIB_O)34 $(AR) $@ $?35 $(RANLIB) $@36 + $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name %PREFIX%/lib/liblua.%COMPAT_VERSION%.dylib \37 + -compatibility_version %COMPAT_VERSION% -current_version %VERSION% $^38 39 $(LUA_T): $(LUA_O) $(LUA_A)40 - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)41 + $(CC) -o $@ -L. $(MYLDFLAGS) $(MYCFLAGS) $(MYLIBS) -llua.%VERSION% lua.c42 43 $(LUAC_T): $(LUAC_O) $(LUA_A)44 $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)45 @@ -99,7 +101,7 @@46 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"47 48 macosx:49 - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"50 + $(MAKE) all MYCFLAGS="-fno-common -DLUA_USE_LINUX" MYLIBS="-lreadline"51 # use this on Mac OS X 10.3-52 # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX53 -
files/patch-src_Makefile.diff
1 --- src/Makefile.orig 2011-03-27 16:49:54.000000000 +0200 2 +++ src/Makefile 2011-03-27 16:55:30.000000000 +0200 3 @@ -23,6 +23,7 @@ 4 PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris 5 6 LUA_A= liblua.a 7 +LUA_DYLIB= liblua.dylib 8 CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ 9 lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ 10 lundump.o lvm.o lzio.o 11 @@ -36,8 +37,8 @@ 12 LUAC_O= luac.o print.o 13 14 ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) 15 -ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) 16 -ALL_A= $(LUA_A) 17 +ALL_T= $(LUA_DYLIB) $(LUA_A) $(LUA_T) $(LUAC_T) 18 +ALL_A= $(LUA_DYLIB) $(LUA_A) 19 20 default: $(PLAT) 21 22 @@ -48,14 +49,20 @@ 23 a: $(ALL_A) 24 25 $(LUA_A): $(CORE_O) $(LIB_O) 26 + @echo "Building static library" 27 $(AR) $@ $? 28 $(RANLIB) $@ 29 30 +$(LUA_DYLIB): $(CORE_O) $(LIB_O) 31 + @echo "Building dylib" 32 + $(CC) -o $@ $(MYLDFLAGS) -dynamiclib -install_name %PREFIX%/lib/liblua.dylib \ 33 + -compatibility_version %COMPAT_VERSION% -current_version %VERSION% $^ 34 + 35 $(LUA_T): $(LUA_O) $(LUA_A) 36 - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) 37 + $(CC) -o $@ -L. $(MYLDFLAGS) $(MYCFLAGS) $(MYLIBS) -llua lua.c 38 39 $(LUAC_T): $(LUAC_O) $(LUA_A) 40 - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) 41 + $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_DYLIB) $(LIBS) 42 43 clean: 44 $(RM) $(ALL_T) $(ALL_O) 45 @@ -99,7 +106,7 @@ 46 $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" 47 48 macosx: 49 - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" 50 + $(MAKE) all MYCFLAGS="-fno-common -DLUA_USE_LINUX" MYLIBS="-lreadline" 51 # use this on Mac OS X 10.3- 52 # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX 53 -
Portfile
25 25 test.run yes 26 26 test.env DYLD_LIBRARY_PATH=./lib 27 27 28 patchfiles patch-dlopen.diff 28 patchfiles patch-Makefile.diff \ 29 patch-src_Makefile.diff 29 30 30 31 post-patch { 31 32 reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/Makefile ${worksrcpath}/src/luaconf.h