summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2020-08-22 15:00:08 +0200
committerQuentin Glidic2020-08-22 16:37:36 +0200
commit40f084de39d72e7a4b58eaa6c2d859dd639a8de2 (patch)
treef9b4b387db92623ebf810e5ddcc703c85bb3c602 /packages
parent2676cc6c74c7553001fac660df0316e6c7888177 (diff)
downloadsardemff7-pending-40f084de39d72e7a4b58eaa6c2d859dd639a8de2.tar.xz
daily: Fix bundled botan build
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/daily-scm.exheres-017
-rw-r--r--packages/mail-client/daily/files/bundled-botan-cc-fix.patch13
2 files changed, 30 insertions, 0 deletions
diff --git a/packages/mail-client/daily/daily-scm.exheres-0 b/packages/mail-client/daily/daily-scm.exheres-0
index 08935c4..f23c9e7 100644
--- a/packages/mail-client/daily/daily-scm.exheres-0
+++ b/packages/mail-client/daily/daily-scm.exheres-0
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
require mozilla-app [ application=comm/mail comm=true ]
+require toolchain-funcs
SUMMARY="Thunderbird Mail and News client"
HOMEPAGE="http://www.mozilla.com/en-US/thunderbird"
@@ -10,5 +11,21 @@ PLATFORMS="~amd64"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/gtk2less.patch
+ "${FILES}"/bundled-botan-cc-fix.patch
)
+src_configure() {
+ local botan_compiler
+
+ if cxx-is-gcc; then
+ botan_compiler=gcc
+ elif cxx-is-clang; then
+ botan_compiler=clang
+ else
+ die "Unknown compiler ${CXX}; you will need to add a check for it to the daily exheres"
+ fi
+
+ mozilla-app_src_configure \
+ EXHERBO_BOTAN_CC=${botan_compiler}
+}
+
diff --git a/packages/mail-client/daily/files/bundled-botan-cc-fix.patch b/packages/mail-client/daily/files/bundled-botan-cc-fix.patch
new file mode 100644
index 0000000..14bc0af
--- /dev/null
+++ b/packages/mail-client/daily/files/bundled-botan-cc-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/comm/third_party/botan/botan.mozbuild b/comm/third_party/botan/botan.mozbuild
+index 3b35edd30e..8f530b0a0a 100644
+--- a/comm/third_party/botan/botan.mozbuild
++++ b/comm/third_party/botan/botan.mozbuild
+@@ -45,7 +45,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:
+ botan_build = GENERATED_FILES['build/build.h']
+ botan_build.script = 'botan_configure.py'
+ botan_build.flags = [
+- '--cc-bin={}'.format(CONFIG['MZLA_RNP_CXX']),
++ '--cc={}'.format(CONFIG['CC_TYPE']),
+ '--cpu={}'.format(CONFIG['target_cpu']),
+ '--os={}'.format(botan_os),
+ '--with-build-dir={}'.format(OBJDIR),