From e0fdb8199de0e7a9b7c72d7f38d2e3ddaecdacd0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Jul 2022 01:41:15 +0100 Subject: gentoo auto-resync : 15:07:2022 - 01:41:14 --- dev-libs/angelscript/Manifest | 5 ++- dev-libs/angelscript/angelscript-2.35.0.ebuild | 48 -------------------- dev-libs/angelscript/angelscript-2.35.1-r1.ebuild | 52 ++++++++++++++++++++++ ...dd-as_callfunc_arm64.cpp-to-gnuc-makefile.patch | 30 +++++++++++++ ...dd-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch | 31 +++++++++++++ 5 files changed, 116 insertions(+), 50 deletions(-) delete mode 100644 dev-libs/angelscript/angelscript-2.35.0.ebuild create mode 100644 dev-libs/angelscript/angelscript-2.35.1-r1.ebuild create mode 100644 dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch create mode 100644 dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch (limited to 'dev-libs/angelscript') diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 3cfef6a81071..5e0be375f5fc 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1,5 +1,6 @@ -DIST angelscript_2.35.0.zip 1971850 BLAKE2B 2253583f46181b420514e3f5a4609a33a019e47ac4ef183d1ddbca52610ce421da28a0e67f16f04b873bd18d9c56673bfac5aba152e6fadff84f8fe4718308a4 SHA512 e54b58e78b21c2ff6aa34d5f55b18fcf8737d057c86aef8901ac0c11f14739fe7f1494f9bcfdbca6a8e54b6d0b36a04dd098780bcd02dea5764fd6d22984b6b0 +AUX 0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch 925 BLAKE2B a5a4f29521ba02b3c422ed40b488a36612dcee302ebc8426d5a02c5ba684e02799806fe769f3e2cbd5d78f16fdb48b14c0e700b1d961bec069f188cf0181123c SHA512 d4806e4750fd8d0f6a8fa8a9d5d30b231968b89ec6ff298809e70ae72dbd605c75566fed50105dfd5bb772c5bc179fc7df95fb6adc1a4089104491099731b002 +AUX 0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch 1025 BLAKE2B 2303787c9f4fda45bfe91326fcf63a616f8714f0315f3895ff6932352b225eb85a7218e05969b700471bee4fd30b36ce0bdd3a6f85262446b2bfc92a8efc47a2 SHA512 92d190db8e7606a9866c2f8061ca30e0b2fce1bc1f7de4567b85bd66c1fe4992f570e468d882ec11b61cfd322d7ea7a659e41a2ccd6a76c3dacf35b38154c038 DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa -EBUILD angelscript-2.35.0.ebuild 993 BLAKE2B d3a12ba2531ce84532b7dcb61a4921fd3caa17820c032c0a79803d4c7bcfad4202c1a3b0c95f1453ebbc0b239c8e7935703d23e181c7dc1cad9420eb2e87e3fe SHA512 148a185791b7d9cf4e51781da3911a9080cf70495b4e1198700791149c4885ce5752775394fc807230b892fb153aced0a8e31bfba90d7cc6cefa76dea70d342f +EBUILD angelscript-2.35.1-r1.ebuild 1157 BLAKE2B 71c76276bd438d06d667ebcec8282d269439705fe29173f79ab6668f0d49db57ffc19c6ec26f7a13938245d65eca847b517d3bca19a522317225baf99fa276d2 SHA512 e94d2e5d2aa0a4931fafb735915054731f5f0908b49e0d20b03a0cbd911cde0b922f9d0fcf17bc68881c421eb9759c863d47dd6f08164c8508688833c4f8e5a0 EBUILD angelscript-2.35.1.ebuild 1000 BLAKE2B 643e6fcdea47e013ab3a38f6dac69747fa1fb15bdb16ba384db920e2800d8cd6a00317daa0b9448a9e80b9b6e3dae7fe8d48ef22d0d541e6da0f0ea11d33fc61 SHA512 4c1a8a32162074c93c7498e34a43b6204da3e1fee27f1b245c363a4a01263bc0f5583b0f156d0690db2912c79f8713bb0996e6aee371a39e3f1b09d02463426b MISC metadata.xml 407 BLAKE2B 5d10a87729e294d0df6a7afd624cd4012116e773736aae89ee56763eee0002feca2206d62b22feaa835383c1b0d197966a5e19f48851281b06df0c7cf9c0a4a8 SHA512 883e575349da504d73f1aad6b8e03fe12a1a0c05a33c63cf592bc1919fe926a4f5fcc80fc68deeb026adc143ebee0b96bbff2f32d0d5fa49554a0af28ee69b19 diff --git a/dev-libs/angelscript/angelscript-2.35.0.ebuild b/dev-libs/angelscript/angelscript-2.35.0.ebuild deleted file mode 100644 index 8c105c0fadfc..000000000000 --- a/dev-libs/angelscript/angelscript-2.35.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs multilib-minimal - -DESCRIPTION="A flexible, cross-platform scripting library" -HOMEPAGE="http://www.angelcode.com/angelscript/" -SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip" -LICENSE="ZLIB" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="doc static-libs" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}/sdk" - -pkg_setup() { - tc-export CXX AR RANLIB -} - -src_prepare() { - default - multilib_copy_sources -} - -multilib_src_compile() { - emake -C ${PN}/projects/gnuc shared \ - $(use static-libs && echo static) -} - -multilib_src_install() { - emake -C ${PN}/projects/gnuc \ - DESTDIR="${D}" \ - PREFIX="${EPREFIX}"/usr \ - LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \ - install_header install_shared \ - $(use static-libs && echo install_static) -} - -multilib_src_install_all() { - if use doc; then - docinto html - dodoc -r docs/* - fi -} diff --git a/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild b/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild new file mode 100644 index 000000000000..d0aa028768b9 --- /dev/null +++ b/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs multilib-minimal + +DESCRIPTION="A flexible, cross-platform scripting library" +HOMEPAGE="http://www.angelcode.com/angelscript/" +SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip" +LICENSE="ZLIB" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="doc static-libs" + +BDEPEND="app-arch/unzip" + +S="${WORKDIR}/sdk" +PATCHES=( + "${FILESDIR}/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch" + "${FILESDIR}/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch" +) + +pkg_setup() { + tc-export CXX AR RANLIB +} + +src_prepare() { + default + multilib_copy_sources +} + +multilib_src_compile() { + emake -C ${PN}/projects/gnuc shared \ + $(use static-libs && echo static) +} + +multilib_src_install() { + emake -C ${PN}/projects/gnuc \ + DESTDIR="${D}" \ + PREFIX="${EPREFIX}"/usr \ + LIBDIR_DEST='$(PREFIX)'/$(get_libdir) \ + install_header install_shared \ + $(use static-libs && echo install_static) +} + +multilib_src_install_all() { + if use doc; then + docinto html + dodoc -r docs/* + fi +} diff --git a/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch b/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch new file mode 100644 index 000000000000..b889c495f3e6 --- /dev/null +++ b/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch @@ -0,0 +1,30 @@ +This patch taken from Debian: +https://salsa.debian.org/yangfl-guest/angelscript/-/blob/master/debian/patches/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch + +Gentoo bug: +https://bugs.gentoo.org/818868 + +From 53841747c668abe3ff2cac280354703bef5dd395 Mon Sep 17 00:00:00 2001 +From: yangfl +Date: Thu, 14 Oct 2021 18:29:25 +0800 +Subject: [PATCH 4/6] Add as_callfunc_arm64.cpp to gnuc makefile + +--- + angelscript/projects/gnuc/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/angelscript/projects/gnuc/Makefile b/angelscript/projects/gnuc/Makefile +index 5274f05e..276baa9e 100644 +--- a/angelscript/projects/gnuc/Makefile ++++ b/angelscript/projects/gnuc/Makefile +@@ -107,6 +107,7 @@ SRCNAMES = \ + as_bytecode.cpp \ + as_callfunc.cpp \ + as_callfunc_arm.cpp \ ++ as_callfunc_arm64.cpp \ + as_callfunc_mips.cpp \ + as_callfunc_ppc.cpp \ + as_callfunc_ppc_64.cpp \ +-- +2.33.0 + diff --git a/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch b/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch new file mode 100644 index 000000000000..ccdd21a5e7c9 --- /dev/null +++ b/dev-libs/angelscript/files/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch @@ -0,0 +1,31 @@ +This file taken from Debian: +https://salsa.debian.org/yangfl-guest/angelscript/-/blob/master/debian/patches/0006-Add-as_callfunc_arm_gcc.S-to-gnuc-makefile.patch + +Gentoo bug: +https://bugs.gentoo.org/818868 + +From 64e3e5a356047531012789802ece987bacb6a120 Mon Sep 17 00:00:00 2001 +From: yangfl +Date: Fri, 15 Oct 2021 02:24:17 +0800 +Subject: [PATCH 6/6] Add as_callfunc_arm_gcc.S to gnuc makefile + +--- + angelscript/projects/gnuc/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/angelscript/projects/gnuc/Makefile b/angelscript/projects/gnuc/Makefile +index 276baa9e..973da7b0 100644 +--- a/angelscript/projects/gnuc/Makefile ++++ b/angelscript/projects/gnuc/Makefile +@@ -145,7 +145,7 @@ OBJ = $(addprefix $(OBJDIR)/, $(notdir $(SRCNAMES:.cpp=.o))) + ifeq ($(TARGETPLATFORM), iphone) + OBJ += $(OBJDIR)/as_callfunc_arm_xcode.o + else +- OBJ += $(OBJDIR)/as_callfunc_arm_gcc.o ++ OBJ += $(OBJDIR)/as_callfunc_arm_gcc.o $(OBJDIR)/as_callfunc_arm64_gcc.o + endif + + +-- +2.33.0 + -- cgit v1.2.3