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)
