1 |
commit: a105303e1edf2afd91440ff0e6598b68b48d946f |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 15 12:28:46 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 15 12:28:46 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a105303e |
7 |
|
8 |
dev-util/boost-build: drop 1.76.0-r2 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/23805 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
dev-util/boost-build/Manifest | 1 - |
14 |
dev-util/boost-build/boost-build-1.76.0-r2.ebuild | 74 ---------------------- |
15 |
...oost-build-1.71.0-darwin-gentoo-toolchain.patch | 26 -------- |
16 |
.../files/boost-build-1.76.0-python-numpy.patch | 24 ------- |
17 |
4 files changed, 125 deletions(-) |
18 |
|
19 |
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest |
20 |
index 220b981ce1dc..f311fa642643 100644 |
21 |
--- a/dev-util/boost-build/Manifest |
22 |
+++ b/dev-util/boost-build/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST boost_1_76_0.tar.bz2 110073117 BLAKE2B 45445e6a9725cb99131e0b831b2fac0840d083692c13887b41adeac5cb8b3732026db3641d6be20591a676b78a87fcf363eb9b1508f87ed26039bba6a1ced533 SHA512 5d68bed98c57e03b4cb2420d9b856e5f0669561a6142a4b0c9c8a58dc5b6b28e16ccbb16ac559c3a3198c45769a246bf996b96cb7b6a019dd15f05c2270e9429 |
25 |
DIST boost_1_77_0.tar.bz2 110361537 BLAKE2B 106aeb09ec7705b595f2ca966a76c53c649eac6fac50d88c156862e0991c33c89a2f3a09edcbcb453fa44bf71cdde030b35d0a0889ad97b65f3a868cb877a532 SHA512 39b45c9b60bc5a2a4c669a4463d1272c1e093376b2fb374d7f20a84ea10a3e23bb04b335a735a83a04575731f874d9bff77e89acd947524b3fbbae1b26ae1f2f |
26 |
DIST boost_1_78_0.tar.bz2 110675550 BLAKE2B ed7da98862ec1e0a28472544400e6f44ffadbc967eed969ce6cb62b1c4f0b7a4b98a395269eb374b57326eff9cdb1dd6e47df9d1a9730aff7c926cc44388fb2d SHA512 9c34a387a203b99aa773eb0c59f5abac7a99ba10e4623653e793c1d5b29b99b88e0e4e0d4e2e4ca5d497c42f2e46e23bab66417722433a457dc818d7670bcbbf |
27 |
|
28 |
diff --git a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild b/dev-util/boost-build/boost-build-1.76.0-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 1e0b91062eb0..000000000000 |
31 |
--- a/dev-util/boost-build/boost-build-1.76.0-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,74 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit flag-o-matic toolchain-funcs |
40 |
- |
41 |
-MY_PV="$(ver_rs 1- _)" |
42 |
- |
43 |
-DESCRIPTION="A system for large project software construction, simple to use and powerful" |
44 |
-HOMEPAGE="https://www.boost.org/build/" |
45 |
-SRC_URI="https://boostorg.jfrog.io/artifactory/main/release/${PV}/source/boost_${MY_PV}.tar.bz2" |
46 |
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src" |
47 |
- |
48 |
-LICENSE="Boost-1.0" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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" |
51 |
-IUSE="examples" |
52 |
-RESTRICT="test" |
53 |
- |
54 |
-PATCHES=( |
55 |
- "${FILESDIR}"/${PN}-1.71.0-disable_python_rpath.patch |
56 |
- "${FILESDIR}"/${PN}-1.71.0-darwin-gentoo-toolchain.patch |
57 |
- "${FILESDIR}"/${PN}-1.73.0-add-none-feature-options.patch |
58 |
- "${FILESDIR}"/${PN}-1.76.0-respect-user-flags.patch |
59 |
- "${FILESDIR}"/${PN}-1.74.0-no-implicit-march-flags.patch |
60 |
- "${FILESDIR}"/${PN}-1.76.0-python-numpy.patch |
61 |
-) |
62 |
- |
63 |
-src_unpack() { |
64 |
- tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed" |
65 |
-} |
66 |
- |
67 |
-src_prepare() { |
68 |
- default |
69 |
- |
70 |
- pushd .. >/dev/null || die |
71 |
- eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch |
72 |
- popd >/dev/null || die |
73 |
-} |
74 |
- |
75 |
-src_configure() { |
76 |
- # need to enable LFS explicitly for 64-bit offsets on 32-bit hosts (#761100) |
77 |
- append-lfs-flags |
78 |
-} |
79 |
- |
80 |
-src_compile() { |
81 |
- cd engine || die |
82 |
- ${CONFIG_SHELL:-${BASH}} ./build.sh cxx --cxx="$(tc-getCXX)" --cxxflags="${CXXFLAGS}" -d+2 --without-python || die "building bjam failed" |
83 |
-} |
84 |
- |
85 |
-src_test() { |
86 |
- # Forget tests, bjam is a lost cause |
87 |
- : |
88 |
-} |
89 |
- |
90 |
-src_install() { |
91 |
- dobin engine/{bjam,b2} |
92 |
- |
93 |
- insinto /usr/share/boost-build/src |
94 |
- doins -r "${FILESDIR}/site-config.jam" \ |
95 |
- ../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \ |
96 |
- build kernel options tools util |
97 |
- |
98 |
- find "${ED}"/usr/share/boost-build/src -iname '*.py' -delete || die |
99 |
- |
100 |
- dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt |
101 |
- |
102 |
- if use examples; then |
103 |
- docinto examples |
104 |
- dodoc -r ../example/. |
105 |
- docompress -x /usr/share/doc/${PF}/examples |
106 |
- fi |
107 |
-} |
108 |
|
109 |
diff --git a/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch b/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch |
110 |
deleted file mode 100644 |
111 |
index 3693677540a4..000000000000 |
112 |
--- a/dev-util/boost-build/files/boost-build-1.71.0-darwin-gentoo-toolchain.patch |
113 |
+++ /dev/null |
114 |
@@ -1,26 +0,0 @@ |
115 |
-Avoid adding all kinds of things to the toolchain's flags that within |
116 |
-Gentoo (Prefix) we really shouldn't, such as sysroot, deployment target, |
117 |
-arch, etc. |
118 |
- |
119 |
---- a/tools/darwin.jam |
120 |
-+++ b/tools/darwin.jam |
121 |
-@@ -239,6 +239,9 @@ |
122 |
- } |
123 |
- } |
124 |
- |
125 |
-+ # leave compiler flags etc. up to the toolchain |
126 |
-+ return $(version-feature) ; |
127 |
-+ |
128 |
- if $(version-feature) |
129 |
- { |
130 |
- if $(.debug-configuration) |
131 |
-@@ -447,7 +450,8 @@ |
132 |
- support-ppc64 = ; |
133 |
- } |
134 |
- } |
135 |
-- switch $(arch) |
136 |
-+ # Gentoo Prefix toolchain doesn't do multi-arch, so don't try either |
137 |
-+ switch $(donotaddarchpleaseXXXarch) |
138 |
- { |
139 |
- case combined : |
140 |
- { |
141 |
|
142 |
diff --git a/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch b/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch |
143 |
deleted file mode 100644 |
144 |
index ed04d5426341..000000000000 |
145 |
--- a/dev-util/boost-build/files/boost-build-1.76.0-python-numpy.patch |
146 |
+++ /dev/null |
147 |
@@ -1,24 +0,0 @@ |
148 |
-From 61adb508853be1fa2c01a0c3a0c55fbd16cb9a52 Mon Sep 17 00:00:00 2001 |
149 |
-From: Peter Dimov <pdimov@×××××.com> |
150 |
-Date: Mon, 24 May 2021 22:11:23 +0300 |
151 |
-Subject: [PATCH] Declare the /python//numpy target to hold the include path |
152 |
- (fixes #725) |
153 |
- |
154 |
---- |
155 |
- tools/python.jam | 3 +++ |
156 |
- 1 file changed, 3 insertions(+) |
157 |
- |
158 |
-diff --git a/tools/python.jam b/tools/python.jam |
159 |
-index 00706932d2..0dfc750a22 100644 |
160 |
---- a/tools/python.jam |
161 |
-+++ b/tools/python.jam |
162 |
-@@ -1052,6 +1052,9 @@ local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : |
163 |
- ; |
164 |
- } |
165 |
- |
166 |
-+ # Declare the numpy target, which contains the NumPy include directory |
167 |
-+ |
168 |
-+ alias numpy : : $(target-requirements) : : <include>$(.numpy-include) ; |
169 |
- } |
170 |
- |
171 |
- # Conditional rule specification that will prevent building of a target |