diff options
| author |   Keri Harris <keri@gentoo.org> | 2020-05-27 16:31:13 +0200 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2020-05-27 16:35:55 +0200 |
| commit | 00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29 (patch) | |
| tree | 89a1a5f6045ca7bf019f9c763be6c65449900db4 | |
| parent | dev-db/qt5-sqlcipher: Remove old. (diff) | |
| download | gentoo-00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29.tar.gz gentoo-00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29.tar.bz2 gentoo-00e0c10e0a7a7cd3b14e17bd63180f6bcc26ef29.zip | |
dev-lang/mozart: fix compile failures with GCC 9. Closes #722954
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Keri Harris <keri@gentoo.org>
| -rw-r--r-- | dev-lang/mozart/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/mozart/mozart-1.4.0-r4.ebuild | 39 |
2 files changed, 25 insertions, 15 deletions
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest index c3fd4a8a9f33..fd420dc7f17a 100644 --- a/dev-lang/mozart/Manifest +++ b/dev-lang/mozart/Manifest @@ -1,3 +1,4 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999 SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462 +DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229 diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild b/dev-lang/mozart/mozart-1.4.0-r4.ebuild index ab9ddf42868e..25aff0bfbc8f 100644 --- a/dev-lang/mozart/mozart-1.4.0-r4.ebuild +++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit elisp-common +inherit elisp-common flag-o-matic -PATCHSET_VER="5" +PATCHSET_VER="6" MY_P="mozart-${PV}.20080704" DESCRIPTION="Advanced development platform for intelligent, distributed applications" HOMEPAGE="https://mozart.github.io/ https://github.com/mozart/mozart" SRC_URI=" mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-src.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz + https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz doc? ( mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-doc.tar.gz )" SLOT="0" @@ -43,9 +43,15 @@ S="${WORKDIR}"/${MY_P} src_prepare() { default eapply "${WORKDIR}"/${PV} + + mkdir -p "${S}"/build/contrib + ln -s "${S}"/configure "${S}"/build/configure } src_configure() { + cd "${S}"/build + + append-flags -fno-tree-vrp local myconf="\ --without-global-oz \ --enable-opt=none" @@ -70,6 +76,7 @@ src_configure() { } src_compile() { + cd "${S}"/build emake bootstrap } @@ -81,24 +88,26 @@ src_test() { } src_install() { + cd "${S}"/build + emake \ PREFIX="${D}"/usr/lib/mozart \ ELISPDIR="${D}${SITELISP}/${PN}" \ install - dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle - dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text - dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc - dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd - dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine - dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl - dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform - dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool - dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text - dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle + dosym ../lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle + dosym ../lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text + dosym ../lib/mozart/bin/ozc /usr/bin/ozc + dosym ../lib/mozart/bin/ozd /usr/bin/ozd + dosym ../lib/mozart/bin/ozengine /usr/bin/ozengine + dosym ../lib/mozart/bin/ozl /usr/bin/ozl + dosym ../lib/mozart/bin/ozplatform /usr/bin/ozplatform + dosym ../lib/mozart/bin/oztool /usr/bin/oztool + dosym ../lib/mozart/bin/pickle2text /usr/bin/pickle2text + dosym ../lib/mozart/bin/text2pickle /usr/bin/text2pickle if use emacs; then - dosym /usr/lib/mozart/bin/oz /usr/bin/oz + dosym ../lib/mozart/bin/oz /usr/bin/oz elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi |