forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Command changing pkg-config file to appropriate variant is written after sources are copied to multilib builds because of that it is not propagated to system it self. Moving it before multilib_copy_source is enough to have fully working slotted Lua. Bug: https://bugs.gentoo.org/672528 Signed-off-by: Karel Kočí <[email protected]> (cherry picked from commit f08c385) Signed-off-by: Robin H. Johnson <[email protected]> Fixes: gentoo#10571 Fixes: https://bugs.gentoo.org/672528
- Loading branch information
Showing
3 changed files
with
430 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
# Copyright 1999-2017 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=5 | ||
|
||
inherit eutils multilib multilib-minimal portability toolchain-funcs versionator | ||
|
||
DESCRIPTION="A powerful light-weight programming language designed for extending applications" | ||
HOMEPAGE="http://www.lua.org/" | ||
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" | ||
|
||
LICENSE="MIT" | ||
SLOT="5.1" | ||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" | ||
IUSE="+deprecated emacs readline static" | ||
|
||
RDEPEND="readline? ( >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}] ) | ||
app-eselect/eselect-lua | ||
!dev-lang/lua:0" | ||
DEPEND="${RDEPEND} | ||
sys-devel/libtool" | ||
PDEPEND="emacs? ( app-emacs/lua-mode )" | ||
|
||
SAN_SLOT="${SLOT//.}" | ||
|
||
MULTILIB_WRAPPED_HEADERS=( | ||
/usr/include/lua${SLOT}/luaconf.h | ||
) | ||
|
||
src_prepare() { | ||
local PATCH_PV=$(get_version_component_range 1-2) | ||
|
||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r2.patch | ||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-module_paths.patch | ||
|
||
# use glibtool on Darwin (versus Apple libtool) | ||
if [[ ${CHOST} == *-darwin* ]] ; then | ||
sed -i -e '/LIBTOOL = /s:libtool:glibtool:' \ | ||
Makefile src/Makefile || die | ||
fi | ||
|
||
#EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch | ||
|
||
# correct lua versioning | ||
sed -i -e 's/\(LIB_VERSION = \)6:1:1/\16:5:1/' src/Makefile | ||
|
||
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html | ||
|
||
if ! use deprecated ; then | ||
# patches from 5.1.4 still apply | ||
epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch | ||
epatch "${FILESDIR}"/${PN}-5.1.4-test.patch | ||
fi | ||
|
||
if ! use readline ; then | ||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-readline.patch | ||
fi | ||
|
||
# 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 (both shared and static | ||
# are installed) | ||
if use static ; then | ||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make_static-r1.patch | ||
fi | ||
|
||
# A slotted Lua uses different directories for headers & names for | ||
# libraries, and pkgconfig should reflect that. | ||
sed -r -i \ | ||
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ | ||
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \ | ||
"${S}"/etc/lua.pc | ||
|
||
# custom Makefiles | ||
multilib_copy_sources | ||
} | ||
|
||
multilib_src_configure() { | ||
# We want packages to find our things... | ||
sed -i \ | ||
-e 's:/usr/local:'${EPREFIX}'/usr:' \ | ||
-e "s:\([/\"]\)\<lib\>:\1$(get_libdir):g" \ | ||
etc/lua.pc src/luaconf.h || die | ||
} | ||
|
||
multilib_src_compile() { | ||
tc-export CC | ||
myflags= | ||
# what to link to liblua | ||
liblibs="-lm" | ||
liblibs="${liblibs} $(dlopen_lib)" | ||
|
||
# what to link to the executables | ||
mylibs= | ||
if use readline; then | ||
mylibs="-lreadline" | ||
fi | ||
|
||
cd src | ||
emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${CFLAGS}" \ | ||
RPATH="${EPREFIX}/usr/$(get_libdir)/" \ | ||
LUA_LIBS="${mylibs}" \ | ||
LIB_LIBS="${liblibs}" \ | ||
V=$(get_version_component_range 1-2) \ | ||
gentoo_all | ||
|
||
mv lua_test ../test/lua.static | ||
} | ||
|
||
multilib_src_install() { | ||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ | ||
V=${SLOT} gentoo_install | ||
|
||
insinto /usr/$(get_libdir)/pkgconfig | ||
newins etc/lua.pc lua${SLOT}.pc | ||
} | ||
|
||
multilib_src_install_all() { | ||
dodoc HISTORY README | ||
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif | ||
|
||
doicon etc/lua.ico | ||
|
||
newman doc/lua.1 lua${SLOT}.1 | ||
newman doc/luac.1 luac${SLOT}.1 | ||
} | ||
|
||
multilib_src_test() { | ||
local positive="bisect cf echo env factorial fib fibfor hello printf sieve | ||
sort trace-calls trace-globals" | ||
local negative="readonly" | ||
local test | ||
|
||
cd "${BUILD_DIR}" || die | ||
for test in ${positive}; do | ||
test/lua.static test/${test}.lua || die "test $test failed" | ||
done | ||
|
||
for test in ${negative}; do | ||
test/lua.static test/${test}.lua && die "test $test failed" | ||
done | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
# Copyright 1999-2017 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
|
||
EAPI=5 | ||
|
||
inherit eutils autotools multilib multilib-minimal portability toolchain-funcs versionator | ||
|
||
DESCRIPTION="A powerful light-weight programming language designed for extending applications" | ||
HOMEPAGE="http://www.lua.org/" | ||
SRC_URI="http://www.lua.org/ftp/${P}.tar.gz" | ||
|
||
LICENSE="MIT" | ||
SLOT="5.2" | ||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" | ||
IUSE="+deprecated emacs readline static" | ||
|
||
RDEPEND="readline? ( sys-libs/readline:0= ) | ||
app-eselect/eselect-lua | ||
!dev-lang/lua:0" | ||
DEPEND="${RDEPEND} | ||
sys-devel/libtool" | ||
PDEPEND="emacs? ( app-emacs/lua-mode )" | ||
|
||
MULTILIB_WRAPPED_HEADERS=( | ||
/usr/include/lua${SLOT}/luaconf.h | ||
) | ||
|
||
src_prepare() { | ||
local PATCH_PV=$(get_version_component_range 1-2) | ||
|
||
epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make-r1.patch | ||
|
||
# use glibtool on Darwin (versus Apple libtool) | ||
if [[ ${CHOST} == *-darwin* ]] ; then | ||
sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \ | ||
Makefile src/Makefile || die | ||
fi | ||
|
||
[ -d "${FILESDIR}/${PV}" ] && \ | ||
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch | ||
|
||
# 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 | ||
|
||
if ! use readline ; then | ||
sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h || die | ||
fi | ||
|
||
# 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 (both shared and static | ||
# are installed) | ||
if use static ; then | ||
sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile || die | ||
fi | ||
|
||
# upstream does not use libtool, but we do (see bug #336167) | ||
cp "${FILESDIR}/configure.in" "${S}"/ || die | ||
eautoreconf | ||
|
||
# A slotted Lua uses different directories for headers & names for | ||
# libraries, and pkgconfig should reflect that. | ||
sed -r -i \ | ||
-e "/^Libs:/s,((-llua)($| )),\2${SLOT}\3," \ | ||
-e "/^Cflags:/s,((-I..includedir.)($| )),\2/lua${SLOT}\3," \ | ||
"${S}"/etc/lua.pc | ||
|
||
# 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_ALL" | ||
|
||
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=$(get_version_component_range 1-2) \ | ||
gentoo_all | ||
} | ||
|
||
multilib_src_install() { | ||
emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ | ||
V=${SLOT} gentoo_install | ||
|
||
# We want packages to find our things... | ||
cp "${FILESDIR}/lua.pc" "${WORKDIR}" | ||
sed -i \ | ||
-e "s:^prefix= :prefix= ${EPREFIX}:" \ | ||
-e "s:^V=.*:V= ${PATCH_PV}:" \ | ||
-e "s:^R=.*:R= ${PV}:" \ | ||
-e "s:/,lib,:/$(get_libdir):g" \ | ||
"${WORKDIR}/lua.pc" | ||
|
||
insinto "/usr/$(get_libdir)/pkgconfig" | ||
newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc" | ||
} | ||
|
||
multilib_src_install_all() { | ||
dodoc README | ||
dohtml doc/*.html doc/*.png doc/*.css doc/*.gif | ||
|
||
newman doc/lua.1 lua${SLOT}.1 | ||
newman doc/luac.1 luac${SLOT}.1 | ||
} | ||
|
||
# Makefile contains a dummy target that doesn't do tests | ||
# but causes issues with slotted lua (bug #510360) | ||
src_test() { :; } |
Oops, something went wrong.