Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/
Date: Sun, 30 Sep 2018 12:57:23
Message-Id: 1538312234.5670bda2daa5d150d0638db28bd480b69daa6187.jer@gentoo
1 commit: 5670bda2daa5d150d0638db28bd480b69daa6187
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 30 12:56:32 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 30 12:57:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5670bda2
7
8 dev-libs/botan: Fix HPPA build.
9
10 Package-Manager: Portage-2.3.50, Repoman-2.3.11
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 dev-libs/botan/botan-2.7.0.ebuild | 37 +++++++++++++++++++++----------------
14 1 file changed, 21 insertions(+), 16 deletions(-)
15
16 diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
17 index 9763cbe67a6..e6887c050c9 100644
18 --- a/dev-libs/botan/botan-2.7.0.ebuild
19 +++ b/dev-libs/botan/botan-2.7.0.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -49,8 +49,12 @@ src_configure() {
27
28 local myos=
29 case ${CHOST} in
30 - *-darwin*) myos=darwin ;;
31 - *) myos=linux ;;
32 + *-darwin*) myos=darwin ;;
33 + *) myos=linux ;;
34 + esac
35 +
36 + case ${CHOST} in
37 + hppa*) CHOSTARCH=parisc ;;
38 esac
39
40 local pythonvers=()
41 @@ -62,25 +66,26 @@ src_configure() {
42 fi
43
44 CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
45 - --prefix="${EPREFIX}/usr" \
46 - --libdir=$(get_libdir) \
47 - --docdir=share/doc \
48 - --cc=gcc \
49 - --os=${myos} \
50 - --cpu=${CHOSTARCH} \
51 - --with-endian="$(tc-endian)" \
52 - --without-doxygen \
53 + $(use_enable static-libs static-library) \
54 + $(use_with boost) \
55 $(use_with bzip2) \
56 + $(use_with doc documentation) \
57 + $(use_with doc sphinx) \
58 $(use_with lzma) \
59 $(use_with sqlite sqlite3) \
60 $(use_with ssl openssl) \
61 $(use_with zlib) \
62 - $(use_with boost) \
63 - $(use_with doc sphinx) \
64 - $(use_with doc documentation) \
65 - $(use_enable static-libs static-library) \
66 - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
67 + $(usex hppa --without-stack-protector '') \
68 + --cc=gcc \
69 + --cpu=${CHOSTARCH} \
70 --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
71 + --docdir=share/doc \
72 + --libdir=$(get_libdir) \
73 + --os=${myos} \
74 + --prefix="${EPREFIX}/usr" \
75 + --with-endian="$(tc-endian)" \
76 + --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
77 + --without-doxygen \
78 || die "configure.py failed"
79 }