From 29aabba0ea759c6a2864ff5631735b67ee38e5e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Feb 2020 18:44:56 +0000 Subject: gentoo resync : 05.02.2020 --- dev-lang/luajit/Manifest | 13 ++---- dev-lang/luajit/files/luajit-2-ldconfig.patch | 31 +++++++++++++ dev-lang/luajit/luajit-2.0.2.ebuild | 66 --------------------------- dev-lang/luajit/luajit-2.0.3-r1.ebuild | 61 ------------------------- dev-lang/luajit/luajit-2.0.3.ebuild | 66 --------------------------- dev-lang/luajit/luajit-2.0.4.ebuild | 61 ------------------------- dev-lang/luajit/luajit-2.0.5-r1.ebuild | 4 +- dev-lang/luajit/luajit-2.0.5.ebuild | 61 ------------------------- dev-lang/luajit/luajit-2.1.0_beta3.ebuild | 4 +- 9 files changed, 40 insertions(+), 327 deletions(-) create mode 100644 dev-lang/luajit/files/luajit-2-ldconfig.patch delete mode 100644 dev-lang/luajit/luajit-2.0.2.ebuild delete mode 100644 dev-lang/luajit/luajit-2.0.3-r1.ebuild delete mode 100644 dev-lang/luajit/luajit-2.0.3.ebuild delete mode 100644 dev-lang/luajit/luajit-2.0.4.ebuild delete mode 100644 dev-lang/luajit/luajit-2.0.5.ebuild (limited to 'dev-lang/luajit') diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index be651f7566b7..715bf2fe8dfc 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -1,13 +1,6 @@ -DIST LuaJIT-2.0.2.tar.gz 843031 BLAKE2B 7dbf36c1d41106bb55b4588920a79b4c68139e009cb157d0f4ca8f0c72d8f7def1edd4517237234c5833acdbda0ec3dc25edb18bc55298b139463dbb6e58476a SHA512 c1afea13ec61a59f37d1f61fc50bcac47208d9d4f0a80689b74e901ad2b34294b6c89a0b4eef54b43f3d2db411660da61b191b0bbfba4ba2f97743a9ee4484e3 -DIST LuaJIT-2.0.3.tar.gz 844927 BLAKE2B a6ed54ef562b7af594367cbc0ed6e20295bb64781ceb6b46df81d10d7abd9fdaf902344ab7a6dfdffa6fc38b05e70648ae53c9cffdfb2a866989eba4b02fe9df SHA512 7b3e3de22ac3602299b5918b60801e45a3278e547a15c16fdae7359538d4ada27ba664935d5f97c7409f330c2f8efeaae9ea03415f5e9d5a9d81e022cd5d36e0 -DIST LuaJIT-2.0.4.tar.gz 847615 BLAKE2B b410d06734056283655e70a53b4f1160553cc74a9d6a80d4a919f7f38589888fff339eda661ec623258a5f186f4eb2d2c9b5809b6f7e55f9e058058426e2fe74 SHA512 a72957bd85d8f457269e78bf08c19b28c5707df5d19920d61918f8a6913f55913ce13037fb9a6463c04cefde0c6644739f390e09d656e4bbc2c236927aa3f8f9 +AUX luajit-2-ldconfig.patch 1099 BLAKE2B f18beb00b703aa4fd5c6d959b72469c34fb67ba9dd1513831c36d5bdd21144457d70a58948bfc47660eadb130bb4f77d55858cd4e4b7c33860df749b22b727bd SHA512 a86be88b8cf65c5a11defeeb16dab92c7d3fe774b2ecd289d9485342236e14c99b78700082c024b703179b55aedeee98bef43d624af23673cfa7ac68a492c6b1 DIST LuaJIT-2.0.5.tar.gz 849845 BLAKE2B 961c8622e19b0e66a76a875cb46ad149cb2559b5af41f360dc41dd0d6bb924583e6477dd1329f67c2ac6ea4b8dc42c5e2f4d63ea49400aba4d9e7c7e85e4b085 SHA512 2636675602b4a060b0571c05220db2061dd2f38568e35b2be346a0f5e3128d87057d11d3d0d7567d8cc4e0817b5e4cf2c52a17a48065520962b157816465a9fe DIST LuaJIT-2.1.0-beta3.tar.gz 1025180 BLAKE2B ac3d12e25bd9946ba41aed6672c66884e7256e6be99d7ee8d1260d697453c966b24d60387f278f47233bad44cda61085c9059e6f62c0bc7cfdaaefde282346c5 SHA512 c44e967a0f671ed32b55aee810bc8b3b63737a2d7363b8984ae1949b24f98dbb3f9be7c1e10239fdeb96a3e3c836f606342cbd61838cf9bcadb077443eb5bc12 -EBUILD luajit-2.0.2.ebuild 1701 BLAKE2B efab2a2a1353da44875c08337d617c41669fe71b2b90335cad6211c000aca07389ef19e92db97ab92102e773b093a38e0fa5c16aac72c2880da773be589f8335 SHA512 b414dbdb569c6121c21b68ff3f0c411d126ca82edff21df5b6640cc55f0c9b9a8edee7975d2bd7bc2d68d0073c7f06e390587884ed82e4827935025406e8df64 -EBUILD luajit-2.0.3-r1.ebuild 1359 BLAKE2B 7636abf7dc42fa1d7c0c791339718308ca2d4b3e08d4e1f132669bb8d0354e2cb106614dda5642785bb8050a6280fa1adf825e7d78ab166184489aa9ac9af6f3 SHA512 4d49cd2b1666c56ad86f63b20660846cc0d2b85bb430177adee0a059f09ee9337f979f04f27262eb8e54081dca2bbade2a13969dfed30f4a7ddde77c14a284d4 -EBUILD luajit-2.0.3.ebuild 1704 BLAKE2B 64a61522a1488c13178dffad3114f900b27aacf2c8b00971f83edb8312744cc045d03567beebbadfdf97bc0f7b8043826db3f9f71ddde5071b7d3abcfdc93556 SHA512 dde1467f89f2feac5123d2f63f1e305925fdca04f09fb4725cf5e0da3ff29ad0ce894fadce71fb1937a5954f14017000cf20175ba639c520cc868a7800577528 -EBUILD luajit-2.0.4.ebuild 1358 BLAKE2B 3dd160052c29cb09107ee75a1650f20959d192b74e2fe1dc4dafb7db0159366ebf264adc1aa078a45691e2cf62892994dbca695abf2a3ef56d4a49c2ba4ad174 SHA512 94f00d88a15725f285061b6d2f5be4d565bfa004776115f7625bfe6aa60ac08c7dd5797b1766de4a225e35938771f297d592f7a230ffc2bf948084bc4ed4631c -EBUILD luajit-2.0.5-r1.ebuild 1417 BLAKE2B 66e9ce52fcd4e6fc252d7b9670b4ff66b180f5a825d1f74df11ea2638af9d74fbff7c4575ea9f398f6f47a9cb5d9c27fc412f65095ec0d90fe68b0aa01d47c60 SHA512 c35b575e042f76dcec40fecc62bcd73ae8b8ce72c859ba11704ae100e3a194cc852b3ca2c8261a460086a2e708c1dc473539572760b87c39949542a374e22ff6 -EBUILD luajit-2.0.5.ebuild 1362 BLAKE2B b182f5afae6fb12e66c1cab40921bb1f81c712f25820e1e40eb82bcc8e3d0596af2a173b71e981acf92eb035375877369ad23d44065ebbc278926f487b30929d SHA512 ad29a171d9798cf7713a1480141ca29e5a38d25eb68c8345d7969b21502bdd60b30b1279e1e294ade12f3de8f6e40685aaa1b5f64a5ffbef0a48e94018caab9e -EBUILD luajit-2.1.0_beta3.ebuild 1153 BLAKE2B 0859cacdea67964134f83016de07021a28061d5d6e9c466cafb01cdfc9aba52a5a25287da9de7805cae45ccfebc9348eaf1dd8168e88887ec0ff6ae2a8919dbd SHA512 fee0cc38e703e0996a2acf274b071f6585bce107fbbc9108f479db458afdab720fbf6d2163f7091b625f3efba685ce22af4779b401f43f7233873f93fc5dc925 +EBUILD luajit-2.0.5-r1.ebuild 1464 BLAKE2B b5c2b6f0cf1f2ea6e0492142d97885f6ecf7365b635de9bfd47aba2bc365ffc02b633cb43a206b187485cb437b8c1429c527744c22a72bbb8f9e2ecd25ba48bb SHA512 cb892aa14fbf24aad93ef6e7a5d83d51cba6e0e5879b938296e9ec2566c2ea70d29750ba34756bd476db5e8da79648636208397cb7f5f8604a3581cf440ec5f5 +EBUILD luajit-2.1.0_beta3.ebuild 1203 BLAKE2B efe5c6177e3b10bd392f95f5742dcfadc4b44d8c4f08782a7bdf49cffc28a3c01c4a7786bc5fa3e6ded5ad0f534c787fc9c20be6ecef9620508efeac3d699ca8 SHA512 2f973c5405c804dfcac1b3c8ff2a5da423e3df52d675f1b495b1d10124fa48c0e17f25d1a15c9709c04ea41556832845523d26d5edf08242907e096707dbde6a MISC metadata.xml 552 BLAKE2B 50666bd08bb7c06c52a28652c0a87988e815c1d3c10cc1425cc7979689fd4738f56aaa6478aaa616a0b76122e42f790b3b415a60078dcc256499019912f0c4d4 SHA512 9d6ef1cb9acf52db52ec192bc51cbab6a7aa198dbf108ed76b25b0e258491b2f8d5ec0981c538546cc96de490c8c1ac852e337ef09ab5898ad4f2c48f5670f07 diff --git a/dev-lang/luajit/files/luajit-2-ldconfig.patch b/dev-lang/luajit/files/luajit-2-ldconfig.patch new file mode 100644 index 000000000000..add449a60381 --- /dev/null +++ b/dev-lang/luajit/files/luajit-2-ldconfig.patch @@ -0,0 +1,31 @@ +From 18c9cf7d3788a8f7408df45df92fc4ae3bcc0d80 Mon Sep 17 00:00:00 2001 +From: Mike Pall +Date: Sat, 25 Jan 2020 17:37:12 +0100 +Subject: [PATCH] Fix POSIX install with missing or incompatible ldconfig. + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 07bc70faf..bff53f286 100644 +--- a/Makefile ++++ b/Makefile +@@ -74,7 +74,7 @@ SYMLINK= ln -sf + INSTALL_X= install -m 0755 + INSTALL_F= install -m 0644 + UNINSTALL= $(RM) +-LDCONFIG= ldconfig -n ++LDCONFIG= ldconfig -n 2>/dev/null + SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ + -e "s|^multilib=.*|multilib=$(MULTILIB)|" + +@@ -118,7 +118,7 @@ install: $(INSTALL_DEP) + $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) + cd src && test -f $(FILE_SO) && \ + $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \ +- $(LDCONFIG) $(INSTALL_LIB) && \ ++ ( $(LDCONFIG) $(INSTALL_LIB) || : ) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \ + $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : + cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) diff --git a/dev-lang/luajit/luajit-2.0.2.ebuild b/dev-lang/luajit/luajit-2.0.2.ebuild deleted file mode 100644 index 1fbe283b77f7..000000000000 --- a/dev-lang/luajit/luajit-2.0.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib pax-utils versionator toolchain-funcs - -MY_PV="$(get_version_component_range 1-3)" -MY_P="LuaJIT-${MY_PV}" -if [[ $(get_version_component_range 4) != "" ]]; then - HOTFIX="v${PV}" - HOTFIX="${HOTFIX/_p/_hotfix}.patch" -fi - -DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" -SRC_URI="http://luajit.org/download/${MY_P}.tar.gz - ${HOTFIX:+http://luajit.org/download/${HOTFIX}}" - -LICENSE="MIT" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" - -S="${WORKDIR}/${MY_P}" - -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi - sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 'sed failed.' - sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.' -} - -src_compile() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install(){ - emake install \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - cd "${S}"/doc - dohtml -r * -} diff --git a/dev-lang/luajit/luajit-2.0.3-r1.ebuild b/dev-lang/luajit/luajit-2.0.3-r1.ebuild deleted file mode 100644 index fbf13232e26f..000000000000 --- a/dev-lang/luajit/luajit-2.0.3-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib pax-utils versionator toolchain-funcs - -MY_PV="$(get_version_component_range 1-3)" -MY_P="LuaJIT-${MY_PV}" -if [[ -n $(get_version_component_range 4) ]]; then - HOTFIX="v${PV}" - HOTFIX="${HOTFIX/_p/_hotfix}.patch" -fi - -DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" -SRC_URI="http://luajit.org/download/${MY_P}.tar.gz - ${HOTFIX:+http://luajit.org/download/${HOTFIX}}" - -LICENSE="MIT" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" - -S="${WORKDIR}/${MY_P}" - -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi -} - -_emake() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - MULTILIB="$(get_libdir)" \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install(){ - _emake install - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - cd "${S}"/doc - dohtml -r * -} diff --git a/dev-lang/luajit/luajit-2.0.3.ebuild b/dev-lang/luajit/luajit-2.0.3.ebuild deleted file mode 100644 index 90bc553cf931..000000000000 --- a/dev-lang/luajit/luajit-2.0.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib pax-utils versionator toolchain-funcs - -MY_PV="$(get_version_component_range 1-3)" -MY_P="LuaJIT-${MY_PV}" -if [[ $(get_version_component_range 4) != "" ]]; then - HOTFIX="v${PV}" - HOTFIX="${HOTFIX/_p/_hotfix}.patch" -fi - -DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" -SRC_URI="http://luajit.org/download/${MY_P}.tar.gz - ${HOTFIX:+http://luajit.org/download/${HOTFIX}}" - -LICENSE="MIT" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" - -S="${WORKDIR}/${MY_P}" - -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi - sed -i "s,PREFIX= /usr/local,PREFIX= ${EPREFIX}/usr," Makefile || die 'sed failed.' - sed -i "s,/lib,/$(get_libdir)," etc/${PN}.pc || die 'sed2 failed.' -} - -src_compile() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install(){ - emake install \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - cd "${S}"/doc - dohtml -r * -} diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild deleted file mode 100644 index 22e97b99a50f..000000000000 --- a/dev-lang/luajit/luajit-2.0.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib pax-utils versionator toolchain-funcs - -MY_PV="$(get_version_component_range 1-3)" -MY_P="LuaJIT-${MY_PV}" -if [[ -n $(get_version_component_range 4) ]]; then - HOTFIX="v${PV}" - HOTFIX="${HOTFIX/_p/_hotfix}.patch" -fi - -DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" -SRC_URI="http://luajit.org/download/${MY_P}.tar.gz - ${HOTFIX:+http://luajit.org/download/${HOTFIX}}" - -LICENSE="MIT" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" - -S="${WORKDIR}/${MY_P}" - -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi -} - -_emake() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - MULTILIB="$(get_libdir)" \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install(){ - _emake install - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - cd "${S}"/doc - dohtml -r * -} diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild index a90f9c43d19b..6b07deee37a7 100644 --- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild +++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -23,6 +23,8 @@ SLOT="2" KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" IUSE="lua52compat static-libs" +PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" ) + S="${WORKDIR}/${MY_P}" src_prepare(){ diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild b/dev-lang/luajit/luajit-2.0.5.ebuild deleted file mode 100644 index 5796c4dc31f5..000000000000 --- a/dev-lang/luajit/luajit-2.0.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib pax-utils versionator toolchain-funcs - -MY_PV="$(get_version_component_range 1-3)" -MY_P="LuaJIT-${MY_PV}" -if [[ -n $(get_version_component_range 4) ]]; then - HOTFIX="v${PV}" - HOTFIX="${HOTFIX/_p/_hotfix}.patch" -fi - -DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" -SRC_URI="http://luajit.org/download/${MY_P}.tar.gz - ${HOTFIX:+http://luajit.org/download/${HOTFIX}}" - -LICENSE="MIT" -# this should probably be pkgmoved to 2.0 for sake of consistency. -SLOT="2" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="lua52compat" - -S="${WORKDIR}/${MY_P}" - -src_prepare(){ - if [[ -n ${HOTFIX} ]]; then - epatch "${DISTDIR}/${HOTFIX}" - fi -} - -_emake() { - emake \ - Q= \ - PREFIX="${EPREFIX}/usr" \ - MULTILIB="$(get_libdir)" \ - DESTDIR="${D}" \ - HOST_CC="$(tc-getBUILD_CC)" \ - STATIC_CC="$(tc-getCC)" \ - DYNAMIC_CC="$(tc-getCC) -fPIC" \ - TARGET_LD="$(tc-getCC)" \ - TARGET_AR="$(tc-getAR) rcus" \ - TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ - "$@" -} - -src_compile() { - _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" -} - -src_install(){ - _emake install - - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" - - cd "${S}"/doc - dohtml -r * -} diff --git a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild index 6497ae142c34..9406beb98c84 100644 --- a/dev-lang/luajit/luajit-2.1.0_beta3.ebuild +++ b/dev-lang/luajit/luajit-2.1.0_beta3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,6 +19,8 @@ SLOT="2" KEYWORDS="" IUSE="lua52compat static-libs" +PATCHES=( "${FILESDIR}/${PN}-2-ldconfig.patch" ) + S="${WORKDIR}/${MY_P}" _emake() { -- cgit v1.2.3