[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/files/, dev-libs/angelscript/
commit: 3e600edabac79d7961d3fc0d139157610f213357 Author: James Le Cuirot gentoo org> AuthorDate: Fri Jun 2 22:19:16 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Jun 2 22:19:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e600eda dev-libs/angelscript: Drop old 2.35.1-r1 Signed-off-by: James Le Cuirot gentoo.org> dev-libs/angelscript/Manifest | 1 - 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 - 4 files changed, 114 deletions(-) diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 27c74c1f114a..f90b1578a0ae 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1,3 +1,2 @@ -DIST angelscript_2.35.1.zip 2033435 BLAKE2B b88189fb78294e5804adf313bc333a9a21760120a42b3df78c9c54861718acf435de55dcfb26a8975407102c1182093caed11bfecc6ba946bc7614f62f7e176a SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa DIST angelscript_2.36.0.zip 2038804 BLAKE2B 83d47ffb8563968d1db4955286ad5c4f7767132ddaa7420126ae3faa34f0b44fe319432324eb4fe3bd9317e79149719c6587cbafb28d061e37801f63be126a59 SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff DIST angelscript_2.36.1.zip 2011471 BLAKE2B 81cd147b7e78abe9a8a342ca3c88191cf1eb0e50f78bcd8c1f2ab36e31eadc3260373159ea084cfe9140897df5187ac268d9624b5f8613564e1d6982b1178a54 SHA512 d6d213ce72135c89e47e67521f654611ff67673f3decd9db3da4b7bf317a04a3f91c5c6ae36658ec3f2b20498facd069af02a91255a24ec79c96d8c90d6b554e diff --git a/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild b/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild deleted file mode 100644 index d0aa028768b9.. --- a/dev-libs/angelscript/angelscript-2.35.1-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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 deleted file mode 100644 index b889c495f3e6.. --- a/dev-libs/angelscript/files/0004-Add-as_callfunc_arm64.cpp-to-gnuc-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index ccdd21a5e7c9.. ---
[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/files/, dev-libs/angelscript/
commit: 479e4b74e76dce202079b441500a11bc228d47d1 Author: matoro users noreply github com> AuthorDate: Mon Jun 27 23:54:42 2022 + Commit: James Le Cuirot gentoo org> CommitDate: Thu Jul 14 22:27:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479e4b74 dev-libs/angelscript: revbump 2.35.1-r1, keyword arm64 Taken without modification from the Debian patchset: https://salsa.debian.org/yangfl-guest/angelscript/-/tree/master/debian/patches Unlike the existing workaround (adding -DAS_MAX_PORTABILITY to CFLAGS), this actually pulls in the arm64-specific implementation rather than falling back to the generic one. Revbump because this currently successfully compiles, but generates a broken library that cannot be linked against (depending on what you use from it) on arm64. Thus we need a revbump to avoid requiring a manual rebuild, even though reverse deps (e.g. games-action/supertuxkart) fail during build. Closes: https://bugs.gentoo.org/811420 Signed-off-by: matoro users.noreply.github.com> Closes: https://github.com/gentoo/gentoo/pull/26102 Signed-off-by: James Le Cuirot gentoo.org> 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 + 3 files changed, 113 insertions(+) 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 ..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 ..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 ..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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/files/, dev-libs/angelscript/
commit: 289834a37a0347ed6211333485d2872d89daf070 Author: James Le Cuirot gentoo org> AuthorDate: Tue Dec 20 22:48:09 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Dec 20 22:48:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289834a3 dev-libs/angelscript: Remove old 2.31.1 Package-Manager: portage-2.3.3 dev-libs/angelscript/Manifest | 1 - dev-libs/angelscript/angelscript-2.31.1.ebuild | 53 -- dev-libs/angelscript/files/gnu-stack.patch | 18 - 3 files changed, 72 deletions(-) diff --git a/dev-libs/angelscript/Manifest b/dev-libs/angelscript/Manifest index 39efba2..5c29442 100644 --- a/dev-libs/angelscript/Manifest +++ b/dev-libs/angelscript/Manifest @@ -1,2 +1 @@ -DIST angelscript_2.31.1.zip 1964292 SHA256 b04a9aed467e014130f8daf2fe52f41d3f6485c703d7dd1114cdd916b8e8e003 SHA512 d31b71e1cdf2ee82736a8fd3f5fa2a213e8b61cf990116d6f84b9159c8db3a99c5b017c9deb3f9927b67807a032d7bfffbb9417eea7e543bfd478a91f58b6ef0 WHIRLPOOL 8ac026bb5f1766729cfecfda93f143efbf50f32d9f0bd6be304cae8d40ec78f322b8ec67e924797c0cf55e3576aa22864b89222e365860315f971e095fa5fedb DIST angelscript_2.31.2.zip 1969871 SHA256 0c0b8097c7c8355c9e95c193a6bf3778fb783604af133d37c09c3465c6f381b2 SHA512 4dd4c64caf4fc66a9fbda55d0fb81b91a6af5f5d4f28728343ff06455418ebaf5a36895e04e0bc2aebd76b510e81357f7e0ffd7e575b49bbc9573c106f24b265 WHIRLPOOL 36c042aa09431e1cb8c542c013eed45e06ff32350c5639beb401a686a20c3b2438f9e8998c4244aaf20c58440deb05fc625a2832602e230d8afaf1ff35b98d2d diff --git a/dev-libs/angelscript/angelscript-2.31.1.ebuild b/dev-libs/angelscript/angelscript-2.31.1.ebuild deleted file mode 100644 index 9eb2302.. --- a/dev-libs/angelscript/angelscript-2.31.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -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 ~x86" -IUSE="doc static-libs" - -DEPEND="app-arch/unzip" - -S="${WORKDIR}/sdk" - -PATCHES=( - "${FILESDIR}/gnu-stack.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/gnu-stack.patch b/dev-libs/angelscript/files/gnu-stack.patch deleted file mode 100644 index 342789f.. --- a/dev-libs/angelscript/files/gnu-stack.patch +++ /dev/null @@ -1,18 +0,0 @@ a/angelscript/source/as_callfunc_arm_gcc.S 2015-06-09 21:40:30.0 +0100 -+++ b/angelscript/source/as_callfunc_arm_gcc.S 2016-06-27 23:23:46.912297799 +0100 -@@ -717,13 +717,13 @@ - - #endif /* hard float abi */ - -+#endif /* arm */ -+ - #if defined(__linux__) && defined(__ELF__) - /* ref: http://hardened.gentoo.org/gnu-stack.xml */ - .section .note.GNU-stack,"",%progbits - #endif - --#endif /* arm */ -- - #endif /* !AS_MAX_PORTABILITY */ - -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/angelscript/files/, dev-libs/angelscript/
commit: adf5347202f926ad3391a3eb6019ab5fa081056f Author: Julian Ospald gentoo org> AuthorDate: Tue Oct 20 14:35:41 2015 + Commit: Julian Ospald gentoo org> CommitDate: Tue Oct 20 14:39:33 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf53472 dev-libs/angelscript: rm old dev-libs/angelscript/angelscript-2.29.2.ebuild | 57 -- dev-libs/angelscript/angelscript-2.30.1.ebuild | 41 dev-libs/angelscript/angelscript-2.30.2.ebuild | 41 .../files/angelscript-2.29.2-execstack.patch | 13 - 4 files changed, 152 deletions(-) diff --git a/dev-libs/angelscript/angelscript-2.29.2.ebuild b/dev-libs/angelscript/angelscript-2.29.2.ebuild deleted file mode 100644 index 930c79d..000 --- a/dev-libs/angelscript/angelscript-2.29.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -DEPEND="app-arch/unzip" - -S=${WORKDIR}/sdk -S2=${WORKDIR}/sdk_static - -pkg_setup() { - tc-export CXX AR RANLIB -} - -src_prepare() { - if use static-libs ; then - cp -pR "${WORKDIR}"/sdk "${S2}"/ || die - fi - epatch "${FILESDIR}"/${P}-execstack.patch - multilib_copy_sources -} - -multilib_src_compile() { - einfo "Shared build" - emake -C ${PN}/projects/gnuc SHARED=1 VERSION=${PV} - - if use static-libs ; then - einfo "Static build" - emake -C ${PN}/projects/gnuc - fi -} - -multilib_src_install() { - doheader ${PN}/include/angelscript.h - dolib.so ${PN}/lib/libangelscript-${PV}.so - dosym libangelscript-${PV}.so /usr/$(get_libdir)/libangelscript.so - - if use static-libs ; then -dolib.a ${PN}/lib/libangelscript.a - fi -} - -multilib_src_install_all() { - use doc && dohtml -r "${WORKDIR}"/sdk/docs/* -} diff --git a/dev-libs/angelscript/angelscript-2.30.1.ebuild b/dev-libs/angelscript/angelscript-2.30.1.ebuild deleted file mode 100644 index 09f40c9..000 --- a/dev-libs/angelscript/angelscript-2.30.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -DEPEND="app-arch/unzip" - -S=${WORKDIR}/sdk - -pkg_setup() { - tc-export CXX AR RANLIB -} - -src_prepare() { - multilib_copy_sources -} - -multilib_src_compile() { - emake -C ${PN}/projects/gnuc -} - -multilib_src_install() { - emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install - use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; } -} - -multilib_src_install_all() { - use doc && dohtml -r "${WORKDIR}"/sdk/docs/* -} diff --git a/dev-libs/angelscript/angelscript-2.30.2.ebuild b/dev-libs/angelscript/angelscript-2.30.2.ebuild deleted file mode 100644 index 09f40c9..000 --- a/dev-libs/angelscript/angelscript-2.30.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -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" -KEYWORDS="~amd64 ~x86" -IUSE="doc static-libs" - -DEPEND="app-arch/unzip" - -S=${WORKDIR}/sdk - -pkg_setup() { - tc-export CXX AR RANLIB -} - -src_prepare() { - multilib_copy_sources -} - -multilib_src_compile() { - emake -C ${PN}/projects/gnuc -} - -multilib_src_install() { - emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install - use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; } -} - -multilib_src_install_all() { - use doc && dohtml -r "${WORKDIR}"/sdk/docs/* -} diff --git a/dev-libs/angelscript/files/angelscript-2.29.2-execstack.patch b/dev-libs/angelscript/files/angelscript-2.29.2-execstack.patch deleted file mode 100644 index 2cdb669..000 --- a/dev-libs/angelscript/files/angelscript-2.29.2-execstack.