1 |
commit: d75dac93ff5c2314a224d5e9486b624a1bb0b972 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 27 03:40:45 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 27 03:40:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75dac93 |
7 |
|
8 |
dev-util/meson: drop 0.59.1-r1 |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
dev-util/meson/Manifest | 1 - |
13 |
.../meson/files/meson-tests-rust-add-libm.patch | 22 ----- |
14 |
dev-util/meson/meson-0.59.1-r1.ebuild | 106 --------------------- |
15 |
3 files changed, 129 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest |
18 |
index 450d1d3524f6..fd415add0961 100644 |
19 |
--- a/dev-util/meson/Manifest |
20 |
+++ b/dev-util/meson/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963 |
23 |
DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3 |
24 |
DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80 |
25 |
DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc |
26 |
|
27 |
diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch |
28 |
deleted file mode 100644 |
29 |
index 45803976bb9b..000000000000 |
30 |
--- a/dev-util/meson/files/meson-tests-rust-add-libm.patch |
31 |
+++ /dev/null |
32 |
@@ -1,22 +0,0 @@ |
33 |
-From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001 |
34 |
-From: Dominique Leuenberger <dimstar@××××××××.org> |
35 |
-Date: Wed, 29 Sep 2021 14:20:53 +0200 |
36 |
-Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55 |
37 |
- |
38 |
-Fixes #9309 |
39 |
---- |
40 |
- test cases/rust/5 polyglot static/meson.build | 1 + |
41 |
- 1 file changed, 1 insertion(+) |
42 |
- |
43 |
-diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build |
44 |
-index de2e61bcbc3..a6e9550b6e2 100644 |
45 |
---- a/test cases/rust/5 polyglot static/meson.build |
46 |
-+++ b/test cases/rust/5 polyglot static/meson.build |
47 |
-@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust') |
48 |
- |
49 |
- deps = [ |
50 |
- meson.get_compiler('c').find_library('dl', required: false), |
51 |
-+ meson.get_compiler('c').find_library('m', required: false), |
52 |
- dependency('threads'), |
53 |
- ] |
54 |
- |
55 |
|
56 |
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild |
57 |
deleted file mode 100644 |
58 |
index f5024d59f182..000000000000 |
59 |
--- a/dev-util/meson/meson-0.59.1-r1.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,106 +0,0 @@ |
62 |
-# Copyright 2016-2021 Gentoo Authors |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=7 |
66 |
-PYTHON_COMPAT=( python3_{7,8,9,10} ) |
67 |
- |
68 |
-if [[ ${PV} = *9999* ]]; then |
69 |
- EGIT_REPO_URI="https://github.com/mesonbuild/meson" |
70 |
- inherit git-r3 |
71 |
-else |
72 |
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
73 |
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
74 |
-fi |
75 |
- |
76 |
-inherit distutils-r1 toolchain-funcs |
77 |
- |
78 |
-DESCRIPTION="Open source build system" |
79 |
-HOMEPAGE="https://mesonbuild.com/" |
80 |
- |
81 |
-LICENSE="Apache-2.0" |
82 |
-SLOT="0" |
83 |
-IUSE="test" |
84 |
-RESTRICT="!test? ( test )" |
85 |
- |
86 |
-DEPEND=" |
87 |
- test? ( |
88 |
- dev-libs/glib:2 |
89 |
- dev-libs/gobject-introspection |
90 |
- dev-util/ninja |
91 |
- dev-vcs/git |
92 |
- sys-libs/zlib[static-libs(+)] |
93 |
- virtual/pkgconfig |
94 |
- ) |
95 |
-" |
96 |
- |
97 |
-PATCHES=( |
98 |
- "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch" |
99 |
- "${FILESDIR}/meson-tests-rust-add-libm.patch" |
100 |
-) |
101 |
- |
102 |
-python_prepare_all() { |
103 |
- local disable_unittests=( |
104 |
- # ASAN and sandbox both want control over LD_PRELOAD |
105 |
- # https://bugs.gentoo.org/673016 |
106 |
- -e 's/test_generate_gir_with_address_sanitizer/_&/' |
107 |
- |
108 |
- # ASAN is unsupported on some targets |
109 |
- # https://bugs.gentoo.org/692822 |
110 |
- -e 's/test_pch_with_address_sanitizer/_&/' |
111 |
- |
112 |
- # https://github.com/mesonbuild/meson/issues/7203 |
113 |
- -e 's/test_templates/_&/' |
114 |
- |
115 |
- # Broken due to python2 wrapper |
116 |
- -e 's/test_python_module/_&/' |
117 |
- ) |
118 |
- |
119 |
- sed -i "${disable_unittests[@]}" run_unittests.py || die |
120 |
- |
121 |
- # Broken due to python2 script created by python_wrapper_setup |
122 |
- rm -r "test cases/frameworks/1 boost" || die |
123 |
- |
124 |
- distutils-r1_python_prepare_all |
125 |
-} |
126 |
- |
127 |
-src_test() { |
128 |
- tc-export PKG_CONFIG |
129 |
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then |
130 |
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests" |
131 |
- else |
132 |
- # https://bugs.gentoo.org/687792 |
133 |
- unset PKG_CONFIG |
134 |
- distutils-r1_src_test |
135 |
- fi |
136 |
-} |
137 |
- |
138 |
-python_test() { |
139 |
- ( |
140 |
- # test_meson_installed |
141 |
- unset PYTHONDONTWRITEBYTECODE |
142 |
- |
143 |
- # test_cross_file_system_paths |
144 |
- unset XDG_DATA_HOME |
145 |
- |
146 |
- # 'test cases/unit/73 summary' expects 80 columns |
147 |
- export COLUMNS=80 |
148 |
- |
149 |
- # If JAVA_HOME is not set, meson looks for javac in PATH. |
150 |
- # If javac is in /usr/bin, meson assumes /usr/include is a valid |
151 |
- # JDK include path. Setting JAVA_HOME works around this broken |
152 |
- # autodection. If no JDK is installed, we should end up with an empty |
153 |
- # value in JAVA_HOME, and the tests should get skipped. |
154 |
- export JAVA_HOME=$(java-config -O 2>/dev/null) |
155 |
- |
156 |
- ${EPYTHON} -u run_tests.py |
157 |
- ) || die "Testing failed with ${EPYTHON}" |
158 |
-} |
159 |
- |
160 |
-python_install_all() { |
161 |
- distutils-r1_python_install_all |
162 |
- |
163 |
- insinto /usr/share/vim/vimfiles |
164 |
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax} |
165 |
- insinto /usr/share/zsh/site-functions |
166 |
- doins data/shell-completions/zsh/_meson |
167 |
-} |