1 |
commit: af141f8e789704d2c8ec47ad6610c8c8198f2e70 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 3 14:39:15 2020 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 3 14:40:49 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=af141f8e |
7 |
|
8 |
scripts/bootstrap-prefix: run econf from bootstrap_simple too |
9 |
|
10 |
and move the libressl specific code down here |
11 |
|
12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
13 |
|
14 |
scripts/bootstrap-prefix.sh | 15 ++++++++------- |
15 |
1 file changed, 8 insertions(+), 7 deletions(-) |
16 |
|
17 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
18 |
index 33f699a817..f18832e648 100755 |
19 |
--- a/scripts/bootstrap-prefix.sh |
20 |
+++ b/scripts/bootstrap-prefix.sh |
21 |
@@ -709,7 +709,7 @@ bootstrap_portage() { |
22 |
} |
23 |
|
24 |
bootstrap_simple() { |
25 |
- local PN PV A S |
26 |
+ local PN PV A S myconf |
27 |
PN=$1 |
28 |
PV=$2 |
29 |
A=${PN}-${PV}.tar.${3:-gz} |
30 |
@@ -731,7 +731,14 @@ bootstrap_simple() { |
31 |
S="${S}"/${PN}-${PV} |
32 |
cd "${S}" |
33 |
|
34 |
+ # for libressl, only provide static lib, such that wget (above) |
35 |
+ # links it in and we don't have to bother about RPATH or something |
36 |
+ if [[ ${PN} == "libressl" ]] ; then |
37 |
+ myconf="${myconf} --enable-static --disable-shared" |
38 |
+ fi |
39 |
+ |
40 |
einfo "Compiling ${A%-*}" |
41 |
+ econf ${myconf} || return 1 |
42 |
v $MAKE || return 1 |
43 |
|
44 |
einfo "Installing ${A%-*}" |
45 |
@@ -885,12 +892,6 @@ bootstrap_gnu() { |
46 |
fi |
47 |
fi |
48 |
|
49 |
- # for libressl, only provide static lib, such that wget (above) |
50 |
- # links it in and we don't have to bother about RPATH or something |
51 |
- if [[ ${PN} == "libressl" ]] ; then |
52 |
- myconf="${myconf} --enable-static --disable-shared" |
53 |
- fi |
54 |
- |
55 |
# SuSE 11.1 has GNU binutils-2.20, choking on crc32_x86 |
56 |
[[ ${PN} == "xz" ]] && myconf="${myconf} --disable-assembler" |