Skip to content

Commit

Permalink
lua: revert to 5.1.4
Browse files Browse the repository at this point in the history 
Closes Homebrew#14974.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
  • Loading branch information
@jacknagel
Peter Aronoff authored and jacknagel committed Sep 16, 2012
1 parent 489e8b7 commit ffafe9d
Showing 1 changed file with 49 additions and 35 deletions.
84 changes: 49 additions & 35 deletions Library/Formula/lua.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

class Lua < Formula
homepage 'http://www.lua.org/'
url 'http://www.lua.org/ftp/lua-5.2.1.tar.gz'
sha1 '6bb1b0a39b6a5484b71a83323c690154f86b2021'
url 'http://www.lua.org/ftp/lua-5.1.4.tar.gz'
md5 'd0870f2de55d59c1c8419f36e8fac150'

fails_with :llvm do
build 2326
Expand All @@ -22,89 +22,103 @@ def patches
# completion provided by advanced readline power patch from
# http://lua-users.org/wiki/LuaPowerPatches
if build.include? 'completion'
p << 'http://luajit.org/patches/lua-5.2.0-advanced_readline.patch'
p << 'http://luajit.org/patches/lua-5.1.4-advanced_readline.patch'
end
p
end

def install
# Apply patch-level 2
curl "https://trac.macports.org/export/90538/trunk/dports/lang/lua/files/patch-lua-5.1.4-3", "-O"
safe_system '/usr/bin/patch', '-d', 'src', '-i', '../patch-lua-5.1.4-3'
# we could use the patches method if it supported additional arguments (-d in our case)

# Use our CC/CFLAGS to compile.
inreplace 'src/Makefile' do |s|
s.remove_make_var! 'CC'
s.change_make_var! 'CFLAGS', "#{ENV.cflags} -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)"
s.change_make_var! 'CFLAGS', "#{ENV.cflags} $(MYCFLAGS)"
s.change_make_var! 'MYLDFLAGS', ENV.ldflags
end

# Fix path in the config header
inreplace 'src/luaconf.h', '/usr/local', HOMEBREW_PREFIX

# this ensures that this symlinking for lua starts at lib/lua/5.2 and not
# 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

system "make", "macosx", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}"
system "make", "install", "INSTALL_TOP=#{prefix}", "INSTALL_MAN=#{man1}"

(lib+"pkgconfig").install 'etc/lua.pc'
end
end

__END__
diff --git a/Makefile b/Makefile
index bd9515f..5940ba9 100644
index 6e78f66..6b48d2b 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
@@ -43,7 +43,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 lua.hpp
TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
-TO_LIB= liblua.a
+TO_LIB= liblua.5.2.1.dylib
+TO_LIB= liblua.5.1.4.dylib
TO_MAN= lua.1 luac.1

# Lua version and release.
@@ -63,6 +63,8 @@ install: dummy
@@ -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.2.1.dylib $(INSTALL_LIB)/liblua.5.2.dylib
+ ln -s -f liblua.5.2.dylib $(INSTALL_LIB)/liblua.dylib
+ ln -s -f liblua.5.1.4.dylib $(INSTALL_LIB)/liblua.5.1.dylib
+ ln -s -f liblua.5.1.dylib $(INSTALL_LIB)/liblua.dylib

uninstall:
cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)
ranlib:
cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
diff --git a/src/Makefile b/src/Makefile
index 8c9ee67..7f92407 100644
index e4a3cd6..e35a1b5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,7 +28,7 @@ MYOBJS=
@@ -22,7 +22,7 @@ MYLIBS=

PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris

-LUA_A= liblua.a
+LUA_A= liblua.5.2.1.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)
+LUA_A= liblua.5.1.4.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)
a: $(ALL_A)

$(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
$(LUA_A): $(CORE_O) $(LIB_O)
- $(AR) $@ $?
- $(RANLIB) $@
+ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.2.dylib \
+ -compatibility_version 5.2 -current_version 5.2.1 \
+ -o liblua.5.2.1.dylib $^
+ $(CC) -dynamiclib -install_name HOMEBREW_PREFIX/lib/liblua.5.1.dylib \
+ -compatibility_version 5.1 -current_version 5.1.4 \
+ -o liblua.5.1.4.dylib $^

$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ $(CC) -fno-common $(MYLDFLAGS) -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.2.1 $(LIBS)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+ $(CC) -fno-common $(MYLDFLAGS) \
+ -o $@ $(LUA_O) $(LUA_A) -L. -llua.5.1.4 $(LIBS)

$(LUAC_T): $(LUAC_O) $(LUA_A)
$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
@@ -106,7 +107,7 @@ linux:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -lncurses"
$(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"

macosx:
- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"
+ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX -fno-common" SYSLIBS="-lreadline"
- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
+ $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX -fno-common" MYLIBS="-lreadline"
# use this on Mac OS X 10.3-
# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX

mingw:
$(MAKE) "LUA_A=lua52.dll" "LUA_T=lua.exe" \

0 comments on commit ffafe9d

Please sign in to comment.