diff options
Diffstat (limited to 'Library/Formula/lua.rb')
| -rw-r--r-- | Library/Formula/lua.rb | 153 |
1 files changed, 71 insertions, 82 deletions
diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb index 6de54f804..16dec015b 100644 --- a/Library/Formula/lua.rb +++ b/Library/Formula/lua.rb @@ -1,18 +1,10 @@ require 'formula' class Lua < Formula - # 5.2 is not fully backwards compatible, and breaks e.g. luarocks. - # It is available in Homebrew-versions for the time being. homepage 'http://www.lua.org/' - url 'http://www.lua.org/ftp/lua-5.1.5.tar.gz' - sha1 'b3882111ad02ecc6b972f8c1241647905cb2e3fc' - - bottle do - cellar :any - sha1 "dcc3b430fd59fd3c16774ecc159d82256ac587db" => :mavericks - sha1 "4ddadaaeaca408964255de43761a7f12b7457bb5" => :mountain_lion - sha1 "212b1a9a5822afd9796fefb42bab63c6466e6faa" => :lion - end + url 'http://www.lua.org/ftp/lua-5.2.3.tar.gz' + sha1 '926b7907bc8d274e063d42804666b40a3f3c124c' + revision 1 fails_with :llvm do build 2326 @@ -20,122 +12,119 @@ class Lua < Formula end option :universal - option 'with-completion', 'Enables advanced readline support' - option 'without-sigaction', 'Revert to ANSI signal instead of improved POSIX sigaction' # Be sure to build a dylib, or else runtime modules will pull in another static copy of liblua = crashy # See: https://github.com/Homebrew/homebrew/pull/5043 patch :DATA - # sigaction provided by posix signalling power patch from - # http://lua-users.org/wiki/LuaPowerPatches - patch do - url "http://lua-users.org/files/wiki_insecure/power_patches/5.1/sig_catch.patch" - sha1 "19f361f0c590f80fccd033486cbee6c9dc8616c8" - end if build.with? "sigaction" - - # completion provided by advanced readline power patch from - # http://lua-users.org/wiki/LuaPowerPatches - patch do - url "http://luajit.org/patches/lua-5.1.4-advanced_readline.patch" - sha1 "3cfe2eb027b51202923d20042ae37f3249508664" - end if build.with? "completion" - def install - ENV.universal_binary if build.universal? - # Use our CC/CFLAGS to compile. inreplace 'src/Makefile' do |s| s.remove_make_var! 'CC' - s.change_make_var! 'CFLAGS', "#{ENV.cflags} $(MYCFLAGS)" + s.change_make_var! 'CFLAGS', "#{ENV.cflags} -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)" s.change_make_var! 'MYLDFLAGS', ENV.ldflags - s.sub! 'MYCFLAGS_VAL', "-fno-common -DLUA_USE_LINUX" end # Fix path in the config header inreplace 'src/luaconf.h', '/usr/local', HOMEBREW_PREFIX - # Fix paths in the .pc - inreplace 'etc/lua.pc' do |s| - s.gsub! "prefix= /usr/local", "prefix=#{HOMEBREW_PREFIX}" - s.gsub! "INSTALL_MAN= ${prefix}/man/man1", "INSTALL_MAN= ${prefix}/share/man/man1" - end - - # this ensures that this symlinking for lua starts at lib/lua/5.1 and not - # below that, thus making luarocks work - (HOMEBREW_PREFIX/"lib/lua"/version.to_s.split('.')[0..1].join('.')).mkpath - + # We ship our own pkg-config file as Lua no longer provide them upstream. system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}" system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}" - - (lib+"pkgconfig").install 'etc/lua.pc' + (lib+"pkgconfig/lua.pc").write pc_file + + # Fix some software potentially hunting for different pc names. + ln_s "#{bin}/lua", "#{bin}/lua5.2" + ln_s "#{bin}/lua", "#{bin}/lua-5.2" + ln_s "#{bin}/luac", "#{bin}/luac5.2" + ln_s "#{bin}/luac", "#{bin}/luac-5.2" + ln_s "#{include}", "#{include}/lua5.2" + ln_s "#{lib}/pkgconfig/lua.pc", "#{lib}/pkgconfig/lua5.2.pc" + ln_s "#{lib}/pkgconfig/lua.pc", "#{lib}/pkgconfig/lua-5.2.pc" end - test do - output = `#{bin}/lua -e "for i=0,9 do io.write(i) end"` - assert_equal "0123456789", output - assert_equal 0, $?.exitstatus + def pc_file; <<-EOS.undent + V= 5.2 + R= 5.2.3 + prefix=#{HOMEBREW_PREFIX} + INSTALL_BIN= ${prefix}/bin + INSTALL_INC= ${prefix}/include + INSTALL_LIB= ${prefix}/lib + INSTALL_MAN= ${prefix}/share/man/man1 + INSTALL_LMOD= ${prefix}/share/lua/${V} + INSTALL_CMOD= ${prefix}/lib/lua/${V} + exec_prefix=${prefix} + libdir=${exec_prefix}/lib + includedir=${prefix}/include + + Name: Lua + Description: An Extensible Extension Language + Version: 5.2.3 + Requires: + Libs: -L${libdir} -llua -lm + Cflags: -I${includedir} + EOS end end __END__ diff --git a/Makefile b/Makefile -index 209a132..9387b09 100644 +index bd9515f..5940ba9 100644 --- a/Makefile +++ b/Makefile -@@ -43,7 +43,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris +@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris # What to install. TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp -TO_LIB= liblua.a -+TO_LIB= liblua.5.1.5.dylib ++TO_LIB= liblua.5.2.3.dylib TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -64,6 +64,8 @@ install: dummy - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -+ ln -s -f liblua.5.1.5.dylib $(INSTALL_LIB)/liblua.5.1.dylib -+ ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib - - ranlib: - cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB) +@@ -63,6 +63,8 @@ install: dummy + cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) + cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) ++ ln -s -f liblua.5.2.3.dylib $(INSTALL_LIB)/liblua.5.2.dylib ++ ln -s -f liblua.5.2.dylib $(INSTALL_LIB)/liblua.dylib + + uninstall: + cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN) diff --git a/src/Makefile b/src/Makefile -index e0d4c9f..4477d7b 100644 +index 8c9ee67..7f92407 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -22,7 +22,7 @@ MYLIBS= +@@ -28,7 +28,7 @@ MYOBJS= PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris -LUA_A= liblua.a -+LUA_A= liblua.5.1.5.dylib - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -48,11 +48,13 @@ o: $(ALL_O) ++LUA_A= liblua.5.2.3.dylib + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -56,11 +56,12 @@ o: $(ALL_O) a: $(ALL_A) - $(LUA_A): $(CORE_O) $(LIB_O) -- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files + $(LUA_A): $(BASE_O) +- $(AR) $@ $(BASE_O) - $(RANLIB) $@ -+ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \ -+ -compatibility_version 5.1 -current_version 5.1.5 \ -+ -o liblua.5.1.5.dylib $^ ++ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.2.dylib \ ++ -compatibility_version 5.2 -current_version 5.2.3 \ ++ -o liblua.5.2.3.dylib $^ $(LUA_T): $(LUA_O) $(LUA_A) -- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+ $(CC) -fno-common $(MYLDFLAGS) \ -+ -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.5 $(LIBS) +- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) ++ $(CC) -fno-common $(MYLDFLAGS) -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.2.3 $(LIBS) $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) -@@ -99,7 +101,7 @@ linux: - $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) +@@ -106,7 +107,7 @@ linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" macosx: -- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline" -+ $(MAKE) all MYCFLAGS="MYCFLAGS_VAL" MYLIBS="-lreadline" - # use this on Mac OS X 10.3- - # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -fno-common" SYSLIBS="-lreadline" CC=cc + + mingw: + $(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \ |