mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-lang/lua: fix 5.4 build on prefix
Similar to how it was fixed for lua 5.3 Closes: https://bugs.gentoo.org/739764 Closes: https://github.com/gentoo/gentoo/pull/24359 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Signed-off-by: William Hubbs <williamh@gentoo.org>
This commit is contained in:
Alexey Sokolov
committed by
William Hubbs
William Hubbs
parent
6da551b380
commit
e75caee08a
99
dev-lang/lua/files/lua-5.4.2-r2-make.patch
Normal file
99
dev-lang/lua/files/lua-5.4.2-r2-make.patch
Normal file
@@ -0,0 +1,99 @@
|
||||
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 = 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 = 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)
|
||||
203
dev-lang/lua/lua-5.4.2-r2.ebuild
Normal file
203
dev-lang/lua/lua-5.4.2-r2.ebuild
Normal file
@@ -0,0 +1,203 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit autotools multilib multilib-minimal portability toolchain-funcs
|
||||
|
||||
DESCRIPTION="A powerful light-weight programming language designed for extending applications"
|
||||
HOMEPAGE="https://www.lua.org/"
|
||||
TEST_PV="5.4.2"
|
||||
TEST_P="${PN}-${TEST_PV}-tests"
|
||||
SRC_URI="
|
||||
https://www.lua.org/ftp/${P}.tar.gz
|
||||
test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5.4"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+deprecated readline test test-complete"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=app-eselect/eselect-lua-3
|
||||
readline? ( sys-libs/readline:0= )
|
||||
!dev-lang/lua:0"
|
||||
# Cross-compiling note:
|
||||
# Must use libtool from the target system (DEPEND) because
|
||||
# libtool from the build system (BDEPEND) is for building
|
||||
# native binaries.
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
sys-devel/libtool"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/lua${SLOT}/luaconf.h
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/lua-5.4.2-r2-make.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# use glibtool on Darwin (versus Apple libtool)
|
||||
if [[ ${CHOST} == *-darwin* ]] ; then
|
||||
sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
|
||||
Makefile src/Makefile || die
|
||||
fi
|
||||
|
||||
# correct lua versioning
|
||||
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
|
||||
|
||||
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
|
||||
|
||||
# Using dynamic linked lua is not recommended for performance
|
||||
# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
|
||||
# Mainly, this is of concern if your arch is poor with GPRs, like x86
|
||||
# Note that this only affects the interpreter binary (named lua), not the lua
|
||||
# compiler (built statically) nor the lua libraries.
|
||||
|
||||
# upstream does not use libtool, but we do (see bug #336167)
|
||||
cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
|
||||
eautoreconf
|
||||
|
||||
# custom Makefiles
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
sed -i \
|
||||
-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
|
||||
-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
|
||||
src/luaconf.h \
|
||||
|| die "failed patching luaconf.h"
|
||||
|
||||
econf
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
tc-export CC
|
||||
|
||||
# what to link to liblua
|
||||
liblibs="-lm"
|
||||
liblibs="${liblibs} $(dlopen_lib)"
|
||||
|
||||
# what to link to the executables
|
||||
mylibs=
|
||||
use readline && mylibs="-lreadline"
|
||||
|
||||
cd src
|
||||
|
||||
local myCFLAGS=""
|
||||
use deprecated && myCFLAGS+="-DLUA_COMPAT_5_3 "
|
||||
use readline && myCFLAGS+="-DLUA_USE_READLINE "
|
||||
|
||||
case "${CHOST}" in
|
||||
*-mingw*) : ;;
|
||||
*) myCFLAGS+="-DLUA_USE_LINUX " ;;
|
||||
esac
|
||||
|
||||
emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
|
||||
SYSLDFLAGS="${LDFLAGS}" \
|
||||
RPATH="${EPREFIX}/usr/$(get_libdir)/" \
|
||||
LUA_LIBS="${mylibs}" \
|
||||
LIB_LIBS="${liblibs}" \
|
||||
V=$(ver_cut 1-2) \
|
||||
LIBTOOL="${ESYSROOT}/usr/bin/libtool" \
|
||||
gentoo_all
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
|
||||
V=${SLOT} gentoo_install
|
||||
|
||||
case $SLOT in
|
||||
0)
|
||||
LIBNAME="lua"
|
||||
INCLUDEDIR_SUFFIX=''
|
||||
;;
|
||||
*) LIBNAME="lua${SLOT}"
|
||||
INCLUDEDIR_SUFFIX="/lua${SLOT}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# We want packages to find our things...
|
||||
# A slotted Lua uses different directories for headers & names for
|
||||
# libraries, and pkgconfig should reflect that.
|
||||
local PATCH_PV=$(ver_cut 1-2)
|
||||
cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
|
||||
sed -r -i \
|
||||
-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
|
||||
-e "s:^prefix= :prefix= ${EPREFIX}:" \
|
||||
-e "s:^V=.*:V= ${PATCH_PV}:" \
|
||||
-e "s:^R=.*:R= ${PV}:" \
|
||||
-e "s:/,lib,:/$(get_libdir):g" \
|
||||
-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
|
||||
-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
|
||||
"${WORKDIR}/lua.pc" || die
|
||||
|
||||
insinto "/usr/$(get_libdir)/pkgconfig"
|
||||
newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
|
||||
# Copy Debian's symlink support:
|
||||
# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
|
||||
# FreeBSD calls the pkgconfig 'lua-5.3.pc'
|
||||
# Older systems called it 'lua53.pc'
|
||||
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
|
||||
dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
DOCS="README"
|
||||
HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
|
||||
einstalldocs
|
||||
newman doc/lua.1 lua${SLOT}.1
|
||||
newman doc/luac.1 luac${SLOT}.1
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
find "${ED}" -name 'liblua*.a' -delete || die
|
||||
}
|
||||
|
||||
# Makefile contains a dummy target that doesn't do tests
|
||||
# but causes issues with slotted lua (bug #510360)
|
||||
src_test() {
|
||||
debug-print-function ${FUNCNAME} "$@"
|
||||
cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
|
||||
# https://www.lua.org/tests/
|
||||
# There are two sets:
|
||||
# basic
|
||||
# complete.
|
||||
#
|
||||
# The basic subset is selected by passing -e'_U=true'
|
||||
# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
|
||||
# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
|
||||
TEST_OPTS="$(usex test-complete '' '-e_U=true')"
|
||||
TEST_MARKER="${T}/test.failed"
|
||||
rm -f "${TEST_MARKER}"
|
||||
|
||||
# If we are failing, set the marker file, and only check it after done all ABIs
|
||||
abi_src_test() {
|
||||
debug-print-function ${FUNCNAME} "$@"
|
||||
TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
|
||||
eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
|
||||
grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
|
||||
return 0
|
||||
}
|
||||
|
||||
multilib_foreach_abi abi_src_test
|
||||
|
||||
if [ -e "${TEST_MARKER}" ]; then
|
||||
cat "${TEST_MARKER}"
|
||||
die "Tests failed"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
eselect lua set --if-unset "${PN}${SLOT}"
|
||||
|
||||
if has_version "app-editor/emacs"; then
|
||||
if ! has_version "app-emacs/lua-mode"; then
|
||||
einfo "Install app-emacs/lua-mode for lua support for emacs"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -37,7 +37,7 @@ MULTILIB_WRAPPED_HEADERS=(
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/lua-5.4.2-make.patch
|
||||
"${FILESDIR}"/lua-5.4.2-r2-make.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user