From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/
Date: Sat, 14 Nov 2020 00:52:50 +0000 (UTC) [thread overview]
Message-ID: <1605315159.fc3a5c679990c8534abf4e4b31ac68ee999e82f0.williamh@gentoo> (raw)
commit: fc3a5c679990c8534abf4e4b31ac68ee999e82f0
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 00:52:11 2020 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 00:52:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc3a5c67
dev-lang/lua: 5.1.5-r105 bump to fix cflags in lua.pc
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
dev-lang/lua/lua-5.1.5-r105.ebuild | 145 +++++++++++++++++++++++++++++++++++++
1 file changed, 145 insertions(+)
diff --git a/dev-lang/lua/lua-5.1.5-r105.ebuild b/dev-lang/lua/lua-5.1.5-r105.ebuild
new file mode 100644
index 00000000000..abdd584d449
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.5-r105.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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 ~sparc ~x86 ~ppc-aix ~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 "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
+ -e "/^includedir=/s,(/include)$,\1/lua${SLOT}," \
+ -e "/^Libs:/s,((-llua)($| )),\2${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
+}
next reply other threads:[~2020-11-14 0:52 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-14 0:52 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-10 20:39 [gentoo-commits] repo/gentoo:master commit in: dev-lang/lua/ William Hubbs
2024-03-29 18:47 Sam James
2023-11-20 13:42 Sam James
2023-10-29 1:58 Sam James
2023-10-17 19:25 Sam James
2023-09-17 5:47 Sam James
2023-09-17 5:07 Arthur Zamarin
2023-09-17 5:07 Arthur Zamarin
2023-09-17 5:07 Arthur Zamarin
2023-09-17 5:07 Arthur Zamarin
2023-07-16 10:32 David Seifert
2022-10-25 11:12 Sam James
2022-10-11 17:15 Arthur Zamarin
2022-10-11 17:15 Arthur Zamarin
2022-10-11 17:15 Arthur Zamarin
2022-10-11 6:48 Agostino Sarubbo
2022-10-11 6:48 Agostino Sarubbo
2022-10-11 6:48 Agostino Sarubbo
2022-10-11 6:47 Agostino Sarubbo
2022-10-11 6:47 Agostino Sarubbo
2022-10-11 6:47 Agostino Sarubbo
2022-10-11 6:46 Agostino Sarubbo
2022-10-11 6:46 Agostino Sarubbo
2022-10-11 6:46 Agostino Sarubbo
2022-10-11 6:45 Agostino Sarubbo
2022-10-11 6:45 Agostino Sarubbo
2022-10-11 6:45 Agostino Sarubbo
2022-10-11 6:44 Agostino Sarubbo
2022-10-11 6:44 Agostino Sarubbo
2022-10-11 6:44 Agostino Sarubbo
2022-10-11 6:43 Agostino Sarubbo
2022-10-11 6:43 Agostino Sarubbo
2022-10-11 6:43 Agostino Sarubbo
2022-10-11 6:41 Agostino Sarubbo
2022-10-11 6:41 Agostino Sarubbo
2022-10-11 6:41 Agostino Sarubbo
2022-09-07 9:30 David Seifert
2022-09-06 15:50 David Seifert
2022-09-06 10:18 David Seifert
2022-09-06 10:18 David Seifert
2022-09-06 10:18 David Seifert
2022-09-06 2:18 Sam James
2022-09-05 15:15 David Seifert
2022-09-05 15:15 David Seifert
2022-09-05 15:15 David Seifert
2022-09-05 13:19 David Seifert
2022-09-05 8:20 David Seifert
2022-09-05 8:20 David Seifert
2022-08-31 18:29 Sam James
2022-08-31 18:29 Sam James
2022-08-31 18:29 Sam James
2022-08-30 18:46 Sam James
2022-08-30 17:57 Sam James
2022-08-30 17:55 Sam James
2022-08-30 17:50 Sam James
2022-08-24 16:24 David Seifert
2022-08-24 16:24 David Seifert
2022-08-24 4:01 Arthur Zamarin
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 18:26 Sam James
2022-08-23 16:48 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-08-23 16:32 Arthur Zamarin
2022-02-14 7:34 William Hubbs
2022-02-14 4:42 William Hubbs
2021-09-20 22:40 James Le Cuirot
2021-09-20 22:29 James Le Cuirot
2021-07-09 12:00 Marek Szuba
2021-07-09 11:37 Marek Szuba
2021-06-25 12:32 Marek Szuba
2021-06-25 12:32 Marek Szuba
2021-06-25 12:32 Marek Szuba
2021-02-09 13:47 Marek Szuba
2021-02-08 15:08 Sergei Trofimovich
2021-02-08 15:08 Sergei Trofimovich
2021-02-08 15:08 Sergei Trofimovich
2021-01-23 22:42 Sam James
2021-01-23 22:42 Sam James
2020-12-29 20:39 William Hubbs
2020-12-29 20:24 William Hubbs
2020-12-29 20:00 William Hubbs
2020-12-27 19:34 Fabian Groffen
2020-12-27 19:22 William Hubbs
2020-12-27 14:08 Fabian Groffen
2020-12-22 14:17 Marek Szuba
2020-12-06 19:56 William Hubbs
2020-12-06 7:50 William Hubbs
2020-12-06 7:48 William Hubbs
2020-12-05 21:31 William Hubbs
2020-12-05 20:36 William Hubbs
2020-12-05 20:07 William Hubbs
2020-11-30 16:10 William Hubbs
2020-11-14 1:17 William Hubbs
2020-10-12 14:47 William Hubbs
2020-01-23 23:44 Robin H. Johnson
2020-01-23 23:44 Robin H. Johnson
2020-01-23 23:44 Robin H. Johnson
2019-03-25 5:18 Robin H. Johnson
2019-03-25 5:13 Robin H. Johnson
2019-03-18 21:38 Rafael Martins
2019-01-25 20:56 Robin H. Johnson
2018-12-30 18:38 Mikle Kolyada
2018-12-15 7:16 Robin H. Johnson
2017-08-16 22:39 Robin H. Johnson
2017-06-28 10:19 Alexis Ballier
2017-03-01 10:43 Michael Weber
2017-01-23 8:07 Michał Górny
2017-01-23 3:39 Rafael Martins
2017-01-14 12:36 Jeroen Roovers
2016-12-02 14:21 Tobias Klausmann
2016-11-30 19:31 Markus Meier
2016-09-19 13:17 Lars Wendler
2016-08-07 18:19 William Hubbs
2016-08-06 10:51 Pacho Ramos
2016-03-23 21:23 Stephen Klimaszewski
2016-01-11 17:59 Fabian Groffen
2016-01-04 20:31 Fabian Groffen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1605315159.fc3a5c679990c8534abf4e4b31ac68ee999e82f0.williamh@gentoo \
--to=williamh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox