--- a/usr/src/cmd/lua/Patches/Makefile.patch64 Mon Mar 21 01:03:46 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
---- Makefile.orig 2009-01-06 02:30:03.368826936 -0800
-+++ Makefile 2009-01-06 02:31:47.782878084 -0800
-@@ -4,15 +4,12 @@
-
- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
-
--# Your platform. See PLATS for possible values.
--PLAT= none
--
- # Where to install. The installation starts in the src and doc directories,
- # so take care if INSTALL_TOP is not an absolute path.
--INSTALL_TOP= /usr/local
-+INSTALL_TOP= $(ROOT)/usr
- INSTALL_BIN= $(INSTALL_TOP)/bin
- INSTALL_INC= $(INSTALL_TOP)/include
--INSTALL_LIB= $(INSTALL_TOP)/lib
-+INSTALL_LIB= $(INSTALL_TOP)/lib/$(MACH64)
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- #
- # You probably want to make INSTALL_LMOD and INSTALL_CMOD consistent with
-@@ -22,9 +19,9 @@
-
- # How to install. If your install program does not support "-p", then you
- # may have to run ranlib on the installed liblua.a (do "make ranlib").
--INSTALL= install -p
--INSTALL_EXEC= $(INSTALL) -m 0755
--INSTALL_DATA= $(INSTALL) -m 0644
-+INSTALL= ginstall -p
-+INSTALL_EXEC= $(INSTALL) -m 0555
-+INSTALL_DATA= $(INSTALL) -m 0444
- #
- # If you don't have install you can use cp instead.
- # INSTALL= cp -p
-@@ -37,33 +34,25 @@
-
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
-
--# Convenience platforms targets.
--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_LIB= liblua.a
-+TO_LIB= liblua.so
- TO_MAN= lua.1 luac.1
-
- # Lua version and release.
- V= 5.1
- R= 5.1.4
-
--all: $(PLAT)
--
--$(PLATS) clean:
-+all clean:
- cd src && $(MAKE) $@
-
- test: dummy
- src/lua test/hello.lua
-
- install: dummy
-- cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
-- cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
-- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
-- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+ cd src && $(MKDIR) $(INSTALL_LIB)
-+ cd src && $(INSTALL_EXEC) $(TO_LIB) $(INSTALL_LIB)
-
- ranlib:
- cd src && cd $(INSTALL_LIB) && $(RANLIB) $(TO_LIB)
---- src/Makefile.orig Tue Mar 10 20:51:12 2009
-+++ src/Makefile Tue Mar 10 20:56:09 2009
-@@ -4,25 +4,19 @@
-
- # == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
-
--# Your platform. See PLATS for possible values.
--PLAT= none
--
--CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
--AR= ar rcu
--RANLIB= ranlib
-+CC=$(CC)
-+FLAG_SPARC:sh= if [ ${MACH64} = "sparcv9" ]; then echo -xcode=pic13; fi
-+CFLAGS= -xO3 -Kpic $(CFLAGS64) $(FLAG_SPARC) $(MYCFLAGS)
- RM= rm -f
--LIBS= -lm $(MYLIBS)
-+LIBS= -lm -lc $(MYLIBS)
-
- MYCFLAGS=
--MYLDFLAGS=
-+MYLDFLAGS= -zdefs -ztext
- MYLIBS=
-
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
-
--PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
--
--LUA_A= liblua.a
-+LUA_SO= liblua.so
- 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
-@@ -29,34 +23,21 @@
- LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
- lstrlib.o loadlib.o linit.o
-
--LUA_T= lua
- LUA_O= lua.o
-
--LUAC_T= luac
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
--ALL_A= $(LUA_A)
-+ALL_T= $(LUA_SO)
-
--default: $(PLAT)
-+default: all
-
--all: $(ALL_T)
--
- o: $(ALL_O)
-
--a: $(ALL_A)
-+$(LUA_SO): $(CORE_O) $(LIB_O)
-+ $(CC) -o $(LUA_SO) -G -h $(LUA_SO) $(CFLAGS) $(MYLDFLAGS) $(CORE_O) \
-+ $(LIB_O) $(LIBS)
-
--$(LUA_A): $(CORE_O) $(LIB_O)
-- $(AR) $@ $?
-- $(RANLIB) $@
--
--$(LUA_T): $(LUA_O) $(LUA_A)
-- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
--
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
--
- clean:
- $(RM) $(ALL_T) $(ALL_O)
-
-@@ -74,49 +55,11 @@
- @echo "MYLDFLAGS = $(MYLDFLAGS)"
- @echo "MYLIBS = $(MYLIBS)"
-
--# convenience targets for popular platforms
-+all:
-+ $(MAKE) $(LUA_SO) MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D__EXTENSIONS__" MYLIBS="-ldl"
-
--none:
-- @echo "Please choose a platform:"
-- @echo " $(PLATS)"
--
--aix:
-- $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
--
--ansi:
-- $(MAKE) all MYCFLAGS=-DLUA_ANSI
--
--bsd:
-- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
--
--freebsd:
-- $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
--
--generic:
-- $(MAKE) all MYCFLAGS=
--
--linux:
-- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
--
--macosx:
-- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lreadline"
--# use this on Mac OS X 10.3-
--# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
--
--mingw:
-- $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
-- "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
-- "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
-- $(MAKE) "LUAC_T=luac.exe" luac.exe
--
--posix:
-- $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
--
--solaris:
-- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
--
- # list targets that do not create files (but not all makes understand .PHONY)
--.PHONY: all $(PLATS) default o a clean depend echo none
-+.PHONY: all default o clean depend echo none
-
- # DO NOT DELETE
-