| 1 |
commit: 00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29 |
| 2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 27 14:31:13 2020 +0000 |
| 4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 27 14:35:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00e0c10e |
| 7 |
|
| 8 |
dev-lang/mozart: fix compile failures with GCC 9. Closes #722954 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Keri Harris <keri <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/mozart/Manifest | 1 + |
| 14 |
dev-lang/mozart/mozart-1.4.0-r4.ebuild | 39 +++++++++++++++++++++------------- |
| 15 |
2 files changed, 25 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest |
| 18 |
index c3fd4a8a9f3..fd420dc7f17 100644 |
| 19 |
--- a/dev-lang/mozart/Manifest |
| 20 |
+++ b/dev-lang/mozart/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999 SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462 |
| 23 |
+DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf |
| 24 |
DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4 |
| 25 |
DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229 |
| 26 |
|
| 27 |
diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild b/dev-lang/mozart/mozart-1.4.0-r4.ebuild |
| 28 |
index ab9ddf42868..25aff0bfbc8 100644 |
| 29 |
--- a/dev-lang/mozart/mozart-1.4.0-r4.ebuild |
| 30 |
+++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild |
| 31 |
@@ -1,18 +1,18 @@ |
| 32 |
-# Copyright 1999-2019 Gentoo Authors |
| 33 |
+# Copyright 1999-2020 Gentoo Authors |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
|
| 38 |
-inherit elisp-common |
| 39 |
+inherit elisp-common flag-o-matic |
| 40 |
|
| 41 |
-PATCHSET_VER="5" |
| 42 |
+PATCHSET_VER="6" |
| 43 |
MY_P="mozart-${PV}.20080704" |
| 44 |
|
| 45 |
DESCRIPTION="Advanced development platform for intelligent, distributed applications" |
| 46 |
HOMEPAGE="https://mozart.github.io/ https://github.com/mozart/mozart" |
| 47 |
SRC_URI=" |
| 48 |
mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-src.tar.gz |
| 49 |
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 50 |
+ https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz |
| 51 |
doc? ( mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-doc.tar.gz )" |
| 52 |
|
| 53 |
SLOT="0" |
| 54 |
@@ -43,9 +43,15 @@ S="${WORKDIR}"/${MY_P} |
| 55 |
src_prepare() { |
| 56 |
default |
| 57 |
eapply "${WORKDIR}"/${PV} |
| 58 |
+ |
| 59 |
+ mkdir -p "${S}"/build/contrib |
| 60 |
+ ln -s "${S}"/configure "${S}"/build/configure |
| 61 |
} |
| 62 |
|
| 63 |
src_configure() { |
| 64 |
+ cd "${S}"/build |
| 65 |
+ |
| 66 |
+ append-flags -fno-tree-vrp |
| 67 |
local myconf="\ |
| 68 |
--without-global-oz \ |
| 69 |
--enable-opt=none" |
| 70 |
@@ -70,6 +76,7 @@ src_configure() { |
| 71 |
} |
| 72 |
|
| 73 |
src_compile() { |
| 74 |
+ cd "${S}"/build |
| 75 |
emake bootstrap |
| 76 |
} |
| 77 |
|
| 78 |
@@ -81,24 +88,26 @@ src_test() { |
| 79 |
} |
| 80 |
|
| 81 |
src_install() { |
| 82 |
+ cd "${S}"/build |
| 83 |
+ |
| 84 |
emake \ |
| 85 |
PREFIX="${D}"/usr/lib/mozart \ |
| 86 |
ELISPDIR="${D}${SITELISP}/${PN}" \ |
| 87 |
install |
| 88 |
|
| 89 |
- dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle |
| 90 |
- dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text |
| 91 |
- dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc |
| 92 |
- dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd |
| 93 |
- dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine |
| 94 |
- dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl |
| 95 |
- dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform |
| 96 |
- dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool |
| 97 |
- dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text |
| 98 |
- dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle |
| 99 |
+ dosym ../lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle |
| 100 |
+ dosym ../lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text |
| 101 |
+ dosym ../lib/mozart/bin/ozc /usr/bin/ozc |
| 102 |
+ dosym ../lib/mozart/bin/ozd /usr/bin/ozd |
| 103 |
+ dosym ../lib/mozart/bin/ozengine /usr/bin/ozengine |
| 104 |
+ dosym ../lib/mozart/bin/ozl /usr/bin/ozl |
| 105 |
+ dosym ../lib/mozart/bin/ozplatform /usr/bin/ozplatform |
| 106 |
+ dosym ../lib/mozart/bin/oztool /usr/bin/oztool |
| 107 |
+ dosym ../lib/mozart/bin/pickle2text /usr/bin/pickle2text |
| 108 |
+ dosym ../lib/mozart/bin/text2pickle /usr/bin/text2pickle |
| 109 |
|
| 110 |
if use emacs; then |
| 111 |
- dosym /usr/lib/mozart/bin/oz /usr/bin/oz |
| 112 |
+ dosym ../lib/mozart/bin/oz /usr/bin/oz |
| 113 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 114 |
fi |
Archives