1 |
commit: 4c718cec2c5a79a1b6e88a8ab5b770ee8b817d50 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 10:49:12 2018 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 30 01:10:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4c718cec |
7 |
|
8 |
Revert "scripts/bootstrap-prefix: add some dep-cycle workarounds from Sam Pfeiffer" |
9 |
|
10 |
Not needed anymore: We are now able to pass use flags from the env. |
11 |
|
12 |
This reverts commit f81e23a7667ec3a0ed4b2af80c611be1b2d4d6d5. |
13 |
|
14 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
15 |
|
16 |
scripts/bootstrap-prefix.sh | 17 +++-------------- |
17 |
1 file changed, 3 insertions(+), 14 deletions(-) |
18 |
|
19 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
20 |
index ea6bc9313f..6af97eaba6 100755 |
21 |
--- a/scripts/bootstrap-prefix.sh |
22 |
+++ b/scripts/bootstrap-prefix.sh |
23 |
@@ -1549,20 +1549,9 @@ bootstrap_stage2() { |
24 |
[[ ${CHOST} == *-solaris* ]] && echo "=dev-libs/libffi-3.3_rc0" \ |
25 |
>> "${ROOT}"/tmp/etc/portage/package.mask |
26 |
|
27 |
- # kill some dependencies here while we're still fragile |
28 |
- { |
29 |
- # cmake has some external dependencies which require autoconf, etc. |
30 |
- # unless we only build the buildtool, bug #603012 |
31 |
- echo "dev-util/cmake -server" |
32 |
- # avoid sys-apps/acl -> attr -> gettext cycle on Linux |
33 |
- echo "sys-devel/gettext -acl" |
34 |
- # gdbm depends on berkdb by default, which pulls in binutils |
35 |
- echo "dev-lang/perl -gdbm -berkdb" |
36 |
- # package needs perl, nls pulls in specific package |
37 |
- echo "sys-apps/help2man -nls" |
38 |
- # avoid hefty set of deps from glib |
39 |
- echo "dev-util/pkgconfig internal-glib" |
40 |
- } >> "${ROOT}"/tmp/etc/portage/package.use |
41 |
+ # cmake has some external dependencies which require autoconf, etc. |
42 |
+ # unless we only build the buildtool, bug #603012 |
43 |
+ echo "dev-util/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use |
44 |
|
45 |
emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |