* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2022-10-02 14:43 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2022-10-02 14:43 UTC (permalink / raw
To: gentoo-commits
commit: d31c666954d430de7122d986f383412cbd3ce550
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Sep 1 15:54:47 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 14:37:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31c6669
dev-lang/lua: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27103
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/lua/files/lua-5.4.2-make.patch | 99 ---------------------------------
1 file changed, 99 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.4.2-make.patch b/dev-lang/lua/files/lua-5.4.2-make.patch
deleted file mode 100644
index 8758e88de91b..000000000000
--- a/dev-lang/lua/files/lua-5.4.2-make.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1797df9..90284d8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,11 +10,11 @@ PLAT= guess
- # so take care if INSTALL_TOP is not an absolute path. See the local target.
- # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
--INSTALL_TOP= /usr/local
-+INSTALL_TOP= /usr
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
--INSTALL_MAN= $(INSTALL_TOP)/man/man1
-+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
- INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
-
-@@ -104,3 +104,18 @@ pc:
- .PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
-diff --git a/src/Makefile b/src/Makefile
-index 514593d..8af8f99 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -37,10 +37,10 @@ CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem
- LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
-
--LUA_T= lua
-+LUA_T= lua$V
- LUA_O= lua.o
-
--LUAC_T= luac
-+LUAC_T= luac$V
- LUAC_O= luac.o
-
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-@@ -60,10 +60,10 @@ $(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
- $(RANLIB) $@
-
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
- test:
-@@ -218,3 +218,30 @@ lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
- lobject.h ltm.h lzio.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2021-02-12 22:35 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2021-02-12 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 792d0a42c96e101793e07e65ad4d2bc9b4903cc5
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 12 13:54:06 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 22:35:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792d0a42
dev-lang/lua: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19427
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/lua/files/lua-5.1-make-r2.patch | 97 -----------------
.../lua/files/lua-5.1.5-disable-deprecated.patch | 59 -----------
dev-lang/lua/files/lua-5.1.5-gentoo-build.patch | 118 ---------------------
dev-lang/lua/files/lua-5.1.5-readline.patch | 17 ---
dev-lang/lua/files/lua-5.2-make-r1.patch | 75 -------------
dev-lang/lua/files/lua-5.3-make-r1.patch | 91 ----------------
dev-lang/lua/files/lua-5.4-makefiles.patch | 99 -----------------
7 files changed, 556 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.1-make-r2.patch b/dev-lang/lua/files/lua-5.1-make-r2.patch
deleted file mode 100644
index 2905a62d0f9..00000000000
--- a/dev-lang/lua/files/lua-5.1-make-r2.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -ru lua-5.1.5.orig/Makefile lua-5.1.5/Makefile
---- lua-5.1.5.orig/Makefile 2014-04-15 17:43:34.845435031 +0200
-+++ lua-5.1.5/Makefile 2014-04-15 19:05:08.669304987 +0200
-@@ -11,7 +11,7 @@
- # so take care if INSTALL_TOP is not an absolute path.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- #
-@@ -126,3 +126,21 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+ test/lua.static test/hello.lua
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
-diff -ru lua-5.1.5.orig/src/Makefile lua-5.1.5/src/Makefile
---- lua-5.1.5.orig/src/Makefile 2014-04-15 17:43:34.844435031 +0200
-+++ lua-5.1.5/src/Makefile 2014-04-15 18:07:21.427397122 +0200
-@@ -29,10 +29,10 @@
- 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_T= lua$V
- LUA_O= lua.o
-
--LUAC_T= luac
-+LUAC_T= luac$V
- LUAC_O= luac.o print.o
-
- ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
-@@ -51,10 +51,10 @@
- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
- $(RANLIB) $@
-
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
- clean:
-@@ -180,3 +180,33 @@
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --tag=CC
-+export LIB_VERSION = 5:1:5
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info 0:0:0 \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+lua_test: $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1.5-disable-deprecated.patch b/dev-lang/lua/files/lua-5.1.5-disable-deprecated.patch
deleted file mode 100644
index d1d7fb10115..00000000000
--- a/dev-lang/lua/files/lua-5.1.5-disable-deprecated.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -rdu old/src/luaconf.h new/src/luaconf.h
---- old/src/luaconf.h 2008-02-12 17:00:03.000000000 +0000
-+++ new/src/luaconf.h 2008-02-12 17:07:55.000000000 +0000
-@@ -340,14 +340,14 @@
- ** CHANGE it to undefined as soon as your programs use only '...' to
- ** access vararg parameters (instead of the old 'arg' table).
- */
--#define LUA_COMPAT_VARARG
-+#undef LUA_COMPAT_VARARG
-
- /*
- @@ LUA_COMPAT_MOD controls compatibility with old math.mod function.
- ** CHANGE it to undefined as soon as your programs use 'math.fmod' or
- ** the new '%' operator instead of 'math.mod'.
- */
--#define LUA_COMPAT_MOD
-+#undef LUA_COMPAT_MOD
-
- /*
- @@ LUA_COMPAT_LSTR controls compatibility with old long string nesting
-@@ -355,14 +355,14 @@
- ** CHANGE it to 2 if you want the old behaviour, or undefine it to turn
- ** off the advisory error when nesting [[...]].
- */
--#define LUA_COMPAT_LSTR 1
-+#undef LUA_COMPAT_LSTR
-
- /*
- @@ LUA_COMPAT_GFIND controls compatibility with old 'string.gfind' name.
- ** CHANGE it to undefined as soon as you rename 'string.gfind' to
- ** 'string.gmatch'.
- */
--#define LUA_COMPAT_GFIND
-+#undef LUA_COMPAT_GFIND
-
- /*
- @@ LUA_COMPAT_OPENLIB controls compatibility with old 'luaL_openlib'
-@@ -370,7 +370,7 @@
- ** CHANGE it to undefined as soon as you replace to 'luaL_register'
- ** your uses of 'luaL_openlib'
- */
--#define LUA_COMPAT_OPENLIB
-+#undef LUA_COMPAT_OPENLIB
-
-
-
-diff -rdu old/test/sieve.lua new/test/sieve.lua
-Rename deprecated functions in test scripts
---- old/test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100
-+++ new/test/sieve.lua 2008-02-20 17:44:22.468281121 +0100
-@@ -14,7 +14,7 @@
- while 1 do
- local n = g()
- if n == nil then return end
-- if math.mod(n, p) ~= 0 then coroutine.yield(n) end
-+ if math.fmod(n, p) ~= 0 then coroutine.yield(n) end
- end
- end)
- end
diff --git a/dev-lang/lua/files/lua-5.1.5-gentoo-build.patch b/dev-lang/lua/files/lua-5.1.5-gentoo-build.patch
deleted file mode 100644
index 62c4ed33648..00000000000
--- a/dev-lang/lua/files/lua-5.1.5-gentoo-build.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- old/Makefile 2012-02-10 10:50:23.000000000 +0100
-+++ new/Makefile 2019-07-12 12:00:30.807725876 +0200
-@@ -22,7 +22,8 @@
-
- # 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?= install -p
-+INSTALL_LINK= ln -s
- INSTALL_EXEC= $(INSTALL) -m 0755
- INSTALL_DATA= $(INSTALL) -m 0644
- #
-@@ -33,7 +34,7 @@
-
- # Utilities.
- MKDIR= mkdir -p
--RANLIB= ranlib
-+RANLIB?= ranlib
-
- # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
-
-@@ -47,13 +48,17 @@
- TO_MAN= lua.1 luac.1
-
- # Lua version and release.
-+M= 5
- V= 5.1
- R= 5.1.5
-
-+# Export to sub-make
-+export M R
-+
- all: $(PLAT)
-
- $(PLATS) clean:
-- cd src && $(MAKE) $@
-+ cd src && $(MKDIR) .libs && $(MAKE) $@
-
- test: dummy
- src/lua test/hello.lua
-@@ -61,6 +66,8 @@
- 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_EXEC) $(TO_LIB:.a=.so.$(R)) $(INSTALL_LIB)
-+ cd src && $(INSTALL_LINK) $(TO_LIB:.a=.so.$(R)) $(INSTALL_LIB)/$(TO_LIB:.a=.so.$(M))
- cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
- cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
- cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
---- old/src/Makefile 2012-02-13 21:41:22.000000000 +0100
-+++ new/src/Makefile 2019-07-12 11:31:02.945290602 +0200
-@@ -7,12 +7,14 @@
- # Your platform. See PLATS for possible values.
- PLAT= none
-
--CC= gcc
--CFLAGS= -O2 -Wall $(MYCFLAGS)
--AR= ar rcu
--RANLIB= ranlib
-+CC?= gcc
-+CFLAGS?= -O2 -Wall $(MYCFLAGS)
-+SOFLAGS= -shared -fPIC -DPIC -Wl,-O1 -Wl,--as-needed -Wl,-soname -Wl,$(LUA_A:.a=.so.$(M)) $(MYLDFLAGS)
-+AR?= ar
-+ARFLAGS?= rcu
-+RANLIB?= ranlib
- RM= rm -f
--LIBS= -lm $(MYLIBS)
-+LIBS?= -lm $(MYLIBS)
-
- MYCFLAGS=
- MYLDFLAGS=
-@@ -35,8 +37,11 @@
- 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)
-+LUAS_T= $(LUA_A:.a=.so.$(R))
-+LUAS_O= $(addprefix .libs/,$(CORE_O) $(LIB_O) $(LUA_O))
-+
-+ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) $(LUAS_O)
-+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUAS_T)
- ALL_A= $(LUA_A)
-
- default: $(PLAT)
-@@ -48,9 +53,12 @@
- a: $(ALL_A)
-
- $(LUA_A): $(CORE_O) $(LIB_O)
-- $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
-+ $(AR) $(ARFLAGS) $@ $(CORE_O) $(LIB_O) # DLL needs all object files
- $(RANLIB) $@
-
-+$(LUAS_T): $(LUAS_O)
-+ $(CC) -o $@ $(SOFLAGS) $(LUAS_O) $(LIBS)
-+
- $(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
-@@ -67,7 +75,7 @@
- @echo "PLAT = $(PLAT)"
- @echo "CC = $(CC)"
- @echo "CFLAGS = $(CFLAGS)"
-- @echo "AR = $(AR)"
-+ @echo "AR = $(AR) $(ARFLAGS)"
- @echo "RANLIB = $(RANLIB)"
- @echo "RM = $(RM)"
- @echo "MYCFLAGS = $(MYCFLAGS)"
-@@ -120,6 +128,9 @@
-
- # DO NOT DELETE
-
-+.libs/%o: %c
-+ $(CC) $(CFLAGS) -fPIC -DPIC -c -o $@ $<
-+
- lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
- lstate.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h \
- lundump.h lvm.h
diff --git a/dev-lang/lua/files/lua-5.1.5-readline.patch b/dev-lang/lua/files/lua-5.1.5-readline.patch
deleted file mode 100644
index 2b5221a8ab4..00000000000
--- a/dev-lang/lua/files/lua-5.1.5-readline.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- old/src/luaconf.h 2006-04-10 20:27:23.000000000 +0200
-+++ new/src/luaconf.h 2006-11-15 14:53:07.000000000 +0100
-@@ -36,7 +36,6 @@
- #if defined(LUA_USE_LINUX)
- #define LUA_USE_POSIX
- #define LUA_USE_DLOPEN /* needs an extra library: -ldl */
--#define LUA_USE_READLINE /* needs some extra libraries */
- #endif
-
- #if defined(LUA_USE_MACOSX)
---- old/src/Makefile 2012-02-13 21:41:22.000000000 +0100
-+++ old/src/Makefile 2019-07-09 09:53:00.000000000 +0100
-@@ -98,3 +98,3 @@
- linux:
-- $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
-+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl"
-
diff --git a/dev-lang/lua/files/lua-5.2-make-r1.patch b/dev-lang/lua/files/lua-5.2-make-r1.patch
deleted file mode 100644
index c65f799c0dc..00000000000
--- a/dev-lang/lua/files/lua-5.2-make-r1.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -11,7 +11,7 @@
- # so take care if INSTALL_TOP is not an absolute path.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- #
-@@ -127,3 +127,18 @@
- .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -39,1 +39,1 @@
--LUA_T= lua
-+LUA_T= lua$V
-@@ -42,1 +42,1 @@
--LUAC_T= luac
-+LUAC_T= luac$V
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -185,3 +185,30 @@
- lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
- lzio.h
-
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.3-make-r1.patch b/dev-lang/lua/files/lua-5.3-make-r1.patch
deleted file mode 100644
index d27eb9938ea..00000000000
--- a/dev-lang/lua/files/lua-5.3-make-r1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -uNr lua-5.3.3.orig/Makefile lua-5.3.3/Makefile
---- lua-5.3.3.orig/Makefile 2016-12-04 22:29:54.839135901 +0100
-+++ lua-5.3.3/Makefile 2016-12-04 22:31:14.235851109 +0100
-@@ -12,7 +12,7 @@
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
- INSTALL_TOP= /usr/local
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
- INSTALL_MAN= $(INSTALL_TOP)/man/man1
- INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
-@@ -112,3 +112,18 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
-diff -uNr lua-5.3.3.orig/src/Makefile lua-5.3.3/src/Makefile
---- lua-5.3.3.orig/src/Makefile 2016-12-04 22:29:54.840135910 +0100
-+++ lua-5.3.3/src/Makefile 2016-12-04 22:34:55.980848068 +0100
-@@ -36,10 +36,10 @@
- lmathlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o loadlib.o linit.o
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
-
--LUA_T= lua
-+LUA_T= lua$V
- LUA_O= lua.o
-
--LUAC_T= luac
-+LUAC_T= luac$V
- LUAC_O= luac.o
-
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-@@ -59,10 +59,10 @@
- $(AR) $@ $(BASE_O)
- $(RANLIB) $@
-
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
- clean:
-@@ -195,3 +195,30 @@
- lobject.h ltm.h lzio.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.4-makefiles.patch b/dev-lang/lua/files/lua-5.4-makefiles.patch
deleted file mode 100644
index 67fb4ad1a33..00000000000
--- a/dev-lang/lua/files/lua-5.4-makefiles.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1797df9..90284d8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -10,11 +10,11 @@ PLAT= guess
- # so take care if INSTALL_TOP is not an absolute path. See the local target.
- # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
- # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
--INSTALL_TOP= /usr/local
-+INSTALL_TOP= /usr
- INSTALL_BIN= $(INSTALL_TOP)/bin
--INSTALL_INC= $(INSTALL_TOP)/include
-+INSTALL_INC= $(INSTALL_TOP)/include/lua$V
- INSTALL_LIB= $(INSTALL_TOP)/lib
--INSTALL_MAN= $(INSTALL_TOP)/man/man1
-+INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
- INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
- INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
-
-@@ -104,3 +104,18 @@ pc:
- .PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
-diff --git a/src/Makefile b/src/Makefile
-index 514593d..8af8f99 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -37,10 +37,10 @@ CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem
- LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
- BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
-
--LUA_T= lua
-+LUA_T= lua$V
- LUA_O= lua.o
-
--LUAC_T= luac
-+LUAC_T= luac$V
- LUAC_O= luac.o
-
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
-@@ -60,10 +60,10 @@ $(LUA_A): $(BASE_O)
- $(AR) $@ $(BASE_O)
- $(RANLIB) $@
-
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
- $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-
- test:
-@@ -218,3 +218,30 @@ lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
- lobject.h ltm.h lzio.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua$V.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2020-12-30 17:03 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2020-12-30 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 1788cd986db0c35c7300d7727f8471a4f11062a1
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:01:48 2020 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 17:03:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1788cd98
dev-lang/lua: remove unneeded reference to BROOT in patches
Bug: https://bugs.gentoo.org/739764
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
dev-lang/lua/files/lua-5.4.2-make.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.4.2-make.patch b/dev-lang/lua/files/lua-5.4.2-make.patch
index 0f66aa6e4db..8758e88de91 100644
--- a/dev-lang/lua/files/lua-5.4.2-make.patch
+++ b/dev-lang/lua/files/lua-5.4.2-make.patch
@@ -25,7 +25,7 @@ index 1797df9..90284d8 100644
+# Use libtool for binary installs, etc.
+
+export V
-+export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
+# See libtool manual about how to set this
+
+gentoo_clean:
@@ -71,7 +71,7 @@ index 514593d..8af8f99 100644
# (end of Makefile)
+
-+export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = /usr/bin/libtool --quiet --tag=CC
+export LIB_VERSION = 6:1:1
+
+# The following rules use libtool for compiling and linking in order to
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2020-12-07 13:12 Marek Szuba
0 siblings, 0 replies; 6+ messages in thread
From: Marek Szuba @ 2020-12-07 13:12 UTC (permalink / raw
To: gentoo-commits
commit: b254a1f5730a7ba6b7f980e502ab3bff9e71f887
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 7 13:02:42 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Dec 7 13:12:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b254a1f5
dev-lang/lua: fix malformed lua-5.1.4-test.patch
This patch has been like this at least since the migration from CVS to Git
but epatch was apparently able to work around the patch author having used
a backup file as diff source, and even for Lua ebuilds using eapply this
was only triggered by disabling USE=-deprecated.
Thanks to Arfrever for the heads-up.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
dev-lang/lua/files/lua-5.1.4-test.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.1.4-test.patch b/dev-lang/lua/files/lua-5.1.4-test.patch
index 99b4ad648cc..4dcfbb9d696 100644
--- a/dev-lang/lua/files/lua-5.1.4-test.patch
+++ b/dev-lang/lua/files/lua-5.1.4-test.patch
@@ -1,5 +1,5 @@
---- test/sieve.lua~ 2002-10-31 03:52:58.000000000 +0100
-+++ test/sieve.lua 2008-02-20 17:44:22.468281121 +0100
+--- a/test/sieve.lua
++++ b/test/sieve.lua
@@ -14,7 +14,7 @@
while 1 do
local n = g()
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2020-11-16 15:59 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2020-11-16 15:59 UTC (permalink / raw
To: gentoo-commits
commit: 70b4bba5b02747defadf22661a040c13a4413a17
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 15:58:19 2020 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 15:59:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b4bba5
dev-lang/lua-5.4: typo fix
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
dev-lang/lua/files/lua-5.4-makefiles.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.4-makefiles.patch b/dev-lang/lua/files/lua-5.4-makefiles.patch
index 87e3a276897..67fb4ad1a33 100644
--- a/dev-lang/lua/files/lua-5.4-makefiles.patch
+++ b/dev-lang/lua/files/lua-5.4-makefiles.patch
@@ -25,7 +25,7 @@ index 1797df9..90284d8 100644
+# Use libtool for binary installs, etc.
+
+export V
-+export LIBTOOL = $(ROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
+# See libtool manual about how to set this
+
+gentoo_clean:
@@ -71,7 +71,7 @@ index 514593d..8af8f99 100644
# (end of Makefile)
+
-+export LIBTOOL = $(ROOT)/usr/bin/libtool --quiet --tag=CC
++export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
+export LIB_VERSION = 6:1:1
+
+# The following rules use libtool for compiling and linking in order to
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/
@ 2016-10-04 16:40 William Hubbs
0 siblings, 0 replies; 6+ messages in thread
From: William Hubbs @ 2016-10-04 16:40 UTC (permalink / raw
To: gentoo-commits
commit: f199a769f111158928c34b7c961c80c79d9b36a9
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Aug 6 14:58:54 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 16:37:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f199a769
dev-lang/lua: remove unused patches
dev-lang/lua/files/lua-5.1-make.patch | 64 ----------------------------
dev-lang/lua/files/lua-5.1-make_static.patch | 12 ------
dev-lang/lua/files/lua-5.2-make.patch | 60 --------------------------
3 files changed, 136 deletions(-)
diff --git a/dev-lang/lua/files/lua-5.1-make.patch b/dev-lang/lua/files/lua-5.1-make.patch
deleted file mode 100644
index 0c88bff..00000000
--- a/dev-lang/lua/files/lua-5.1-make.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,22 @@
- .PHONY: all $(PLATS) clean test install local none dummy echo pecho lecho newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_test: gentoo_linux
-+ test/lua.static test/hello.lua
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.a $(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -176,3 +176,36 @@
- ltm.h lzio.h lmem.h lopcodes.h lundump.h
-
- # (end of Makefile)
-+
-+export LIBTOOL = libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LIB_NAME:.la=.a): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $(LIB_NAME:.la=.a) $(LIB_OBJS)
-+
-+$(LUA_T): $(LUA_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LUA_LIBS) -llua
-+
-+lua_test: $(LUA_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LIB_NAME:.la=.a) $(LUA_T) lua_test $(LUAC_T)
diff --git a/dev-lang/lua/files/lua-5.1-make_static.patch b/dev-lang/lua/files/lua-5.1-make_static.patch
deleted file mode 100644
index f012568..00000000
--- a/dev-lang/lua/files/lua-5.1-make_static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru lua-5.1.1.orig/src/Makefile lua-5.1.1/src/Makefile
---- lua-5.1.1.orig/src/Makefile 2006-11-21 07:19:31 +0000
-+++ lua-5.1.1/src/Makefile 2006-11-21 07:19:52 +0000
-@@ -196,7 +196,7 @@
- -rpath $(RPATH) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-
- $(LUA_T): $(LUA_O) $(LIB_NAME)
-- $(LIBTOOL) --mode=link $(CC) -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LUA_LIBS) -llua
-+ $(LIBTOOL) --mode=link $(CC) -static -Wl,-E $(LDFLAGS) -o $@ $(LUA_O) $(LIB_NAME) $(LUA_LIBS)
-
- $(LUAC_T): $(LUAC_O) $(LIB_NAME)
- $(LIBTOOL) --mode=link $(CC) -static -o $@ $(LUAC_O) $(LIB_NAME)
diff --git a/dev-lang/lua/files/lua-5.2-make.patch b/dev-lang/lua/files/lua-5.2-make.patch
deleted file mode 100644
index 431bbde..00000000
--- a/dev-lang/lua/files/lua-5.2-make.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- lua-5.1.1.orig/Makefile 2006-06-02 12:53:38.000000000 +0200
-+++ lua-5.1.1/Makefile 2006-11-16 02:16:53.000000000 +0100
-@@ -127,3 +127,18 @@
- .PHONY: all $(PLATS) clean install local none dummy echo pecho lecho newer
-
- # (end of Makefile)
-+
-+# Use libtool for binary installs, etc.
-+
-+export V
-+export LIBTOOL = ../libtool --quiet --tag=CC
-+# See libtool manual about how to set this
-+
-+gentoo_clean:
-+ cd src; $(MAKE) $@
-+
-+gentoo_install:
-+ mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua luac $(INSTALL_BIN)
-+ cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
-+ cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua.la $(INSTALL_LIB)
---- lua-5.1.1.orig/src/Makefile 2006-03-22 01:41:49.000000000 +0100
-+++ lua-5.1.1/src/Makefile 2006-11-16 02:10:27.000000000 +0100
-@@ -54,1 +54,1 @@
--$(LUA_T): $(LUA_O) $(LUA_A)
-+origin$(LUA_T): $(LUA_O) $(LUA_A)
-@@ -57,1 +57,1 @@
--$(LUAC_T): $(LUAC_O) $(LUA_A)
-+origin$(LUAC_T): $(LUAC_O) $(LUA_A)
-@@ -185,3 +185,30 @@
- lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
- lzio.h
-
-+
-+export LIBTOOL = ../libtool --quiet --tag=CC
-+export LIB_VERSION = 6:1:1
-+
-+# The following rules use libtool for compiling and linking in order to
-+# provide shared library support.
-+
-+LIB_NAME = liblua.la
-+LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
-+
-+%.lo %.o: %.c
-+ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+
-+$(LIB_NAME): $(LIB_OBJS)
-+ $(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
-+ -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
-+
-+$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
-+
-+$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
-+ $(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
-+
-+gentoo_clean:
-+ $(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua luac
-+
-+gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-10-02 14:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-02 14:43 [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/files/ Conrad Kostecki
-- strict thread matches above, loose matches on Subject: below --
2021-02-12 22:35 Conrad Kostecki
2020-12-30 17:03 William Hubbs
2020-12-07 13:12 Marek Szuba
2020-11-16 15:59 William Hubbs
2016-10-04 16:40 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox