summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2017-03-13 13:01:07 +0100
committerQuentin Glidic2017-03-13 13:55:10 +0100
commit1e445de6120dad062ad4e7e98ae04707a2dad58c (patch)
tree09b1fa276c9d0c4a813f2d6fe977f1d38286be4d /packages
parentafdc82a7d0bc82d68ee9439fbe11cfe8c7682945 (diff)
downloadsardemff7-pending-1e445de6120dad062ad4e7e98ae04707a2dad58c.tar.xz
mozilla-app: Fix unprefixed cpp calls
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'packages')
-rw-r--r--packages/mail-client/daily/daily-scm.exheres-01
-rw-r--r--packages/mail-client/daily/files/cpp.patch123
-rw-r--r--packages/net-www/nightly/files/cpp.patch27
-rw-r--r--packages/net-www/nightly/nightly-scm.exheres-01
4 files changed, 152 insertions, 0 deletions
diff --git a/packages/mail-client/daily/daily-scm.exheres-0 b/packages/mail-client/daily/daily-scm.exheres-0
index 70a24fd..db2592f 100644
--- a/packages/mail-client/daily/daily-scm.exheres-0
+++ b/packages/mail-client/daily/daily-scm.exheres-0
@@ -10,5 +10,6 @@ PLATFORMS="~amd64"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/gtk2less.patch
+ "${FILES}"/cpp.patch
)
diff --git a/packages/mail-client/daily/files/cpp.patch b/packages/mail-client/daily/files/cpp.patch
new file mode 100644
index 0000000..630b00c
--- /dev/null
+++ b/packages/mail-client/daily/files/cpp.patch
@@ -0,0 +1,123 @@
+Upstream: no
+Reason: Fails with our prefixed cc/cpp
+
+From d817ce27bd88bdfa48544529d48e4c46e011e984 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 19 Feb 2017 22:55:22 +0100
+Subject: [PATCH] Revert "Bug 1299919 - Set CPP/CXXCPP from python configure.
+ r=chmanchester"
+
+This reverts commit 309608f8661d43e021a2c2c451f25760f7e9e2b9.
+---
+ build/autoconf/toolchain.m4 | 8 --------
+ build/moz.configure/toolchain.configure | 17 -----------------
+ dom/bindings/GenerateCSS2PropertiesWebIDL.py | 2 +-
+ js/src/old-configure.in | 3 +++
+ layout/style/GenerateCSSPropsGenerated.py | 2 +-
+ old-configure.in | 3 +++
+ 6 files changed, 8 insertions(+), 27 deletions(-)
+
+diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
+index c8503e5d63f5..8353967a180c 100644
+--- a/mozilla/build/autoconf/toolchain.m4
++++ b/mozilla/build/autoconf/toolchain.m4
+@@ -2,14 +2,6 @@ dnl This Source Code Form is subject to the terms of the Mozilla Public
+ dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+ dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+-dnl Several autoconf functions AC_REQUIRE AC_PROG_CPP/AC_PROG_CXXCPP,
+-dnl meaning they are called even when we don't call them explicitly.
+-dnl However, theses checks are not necessary and python configure sets
+-dnl the corresponding variables already, so just skip those tests
+-dnl entirely.
+-define([AC_PROG_CPP],[])
+-define([AC_PROG_CXXCPP],[])
+-
+ AC_DEFUN([MOZ_TOOL_VARIABLES],
+ [
+ GNU_AS=
+diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
+index fdf4a738919d..b5fb000a6e57 100644
+--- a/mozilla/build/moz.configure/toolchain.configure
++++ b/mozilla/build/moz.configure/toolchain.configure
+@@ -756,23 +756,6 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
+ valid_compiler.try_compile(check_msg='%s works' % what,
+ onerror=compiler_error)
+
+-
+- # Set CPP/CXXCPP for both the build system and old-configure. We don't
+- # need to check this works for preprocessing, because we already relied
+- # on $CC -E/$CXX -E doing preprocessing work to validate the compiler
+- # in the first place.
+- if host_or_target == target:
+- pp_var = {
+- 'C': 'CPP',
+- 'C++': 'CXXCPP',
+- }[language]
+-
+- preprocessor = depends_if(valid_compiler)(
+- lambda x: list(x.wrapper) + [x.compiler, '-E'] + list(x.flags))
+-
+- set_config(pp_var, preprocessor)
+- add_old_configure_assignment(pp_var, preprocessor)
+-
+ return valid_compiler
+
+
+diff --git a/dom/bindings/GenerateCSS2PropertiesWebIDL.py b/dom/bindings/GenerateCSS2PropertiesWebIDL.py
+index 58ec60c29b10..73e1541c13b0 100644
+--- a/mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py
++++ b/mozilla/dom/bindings/GenerateCSS2PropertiesWebIDL.py
+@@ -16,7 +16,7 @@ def generateLine(propName, extendedAttrs):
+ return " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
+ propName)
+ def generate(output, idlFilename, preprocessorHeader):
+- cpp = list(buildconfig.substs['CPP'])
++ cpp = shellutil.split(buildconfig.substs['CPP'])
+ cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
+ cpp.append(preprocessorHeader)
+ preprocessed = subprocess.check_output(cpp)
+diff --git a/js/src/old-configure.in b/js/src/old-configure.in
+index a5892f6ae2eb..326a520859c0 100644
+--- a/mozilla/js/src/old-configure.in
++++ b/mozilla/js/src/old-configure.in
+@@ -140,6 +140,9 @@ fi
+
+ MOZ_TOOL_VARIABLES
+
++AC_PROG_CPP
++AC_PROG_CXXCPP
++
+ dnl Special win32 checks
+ dnl ========================================================
+
+diff --git a/layout/style/GenerateCSSPropsGenerated.py b/layout/style/GenerateCSSPropsGenerated.py
+index 5038e9afe726..4dc2a253a811 100644
+--- a/mozilla/layout/style/GenerateCSSPropsGenerated.py
++++ b/mozilla/layout/style/GenerateCSSPropsGenerated.py
+@@ -10,7 +10,7 @@ import buildconfig
+ from mozbuild import shellutil
+
+ def get_properties(preprocessorHeader):
+- cpp = list(buildconfig.substs['CPP'])
++ cpp = shellutil.split(buildconfig.substs['CPP'])
+ cpp += shellutil.split(buildconfig.substs['ACDEFINES'])
+ cpp.append(preprocessorHeader)
+ preprocessed = subprocess.check_output(cpp)
+diff --git a/old-configure.in b/old-configure.in
+index ce27c0aa3f0e..0e9fdd20e69a 100644
+--- a/mozilla/old-configure.in
++++ b/mozilla/old-configure.in
+@@ -241,6 +241,9 @@ fi
+
+ MOZ_TOOL_VARIABLES
+
++AC_PROG_CPP
++AC_PROG_CXXCPP
++
+ dnl ========================================================
+ dnl Special win32 checks
+ dnl ========================================================
+--
+2.11.1
+
diff --git a/packages/net-www/nightly/files/cpp.patch b/packages/net-www/nightly/files/cpp.patch
new file mode 100644
index 0000000..faa4af2
--- /dev/null
+++ b/packages/net-www/nightly/files/cpp.patch
@@ -0,0 +1,27 @@
+From be5b622e1f6c85bbfab8c8c44920f49c41320a39 Mon Sep 17 00:00:00 2001
+From: Quentin Glidic <sardemff7+git@sardemff7.net>
+Date: Mon, 13 Mar 2017 13:54:43 +0100
+Subject: [PATCH 2/2] Revert "Bug 1316879 - Don't use CPP/CXXCPP from
+ environment after bug 1299919. r=glandium"
+
+This reverts commit b3512d775a0cc7a929a47bd28fa83d9075a5e401.
+
+Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
+---
+ build/buildconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/buildconfig.py b/build/buildconfig.py
+index e73903a1a981..bb12114b2f4a 100644
+--- a/build/buildconfig.py
++++ b/build/buildconfig.py
+@@ -16,5 +16,5 @@ for var in ('topsrcdir', 'topobjdir', 'defines', 'non_global_defines',
+ substs = dict(substs)
+
+ for var in os.environ:
+- if var not in ('CPP', 'CXXCPP', 'SHELL') and var in substs:
++ if var != 'SHELL' and var in substs:
+ substs[var] = os.environ[var]
+--
+2.11.1
+
diff --git a/packages/net-www/nightly/nightly-scm.exheres-0 b/packages/net-www/nightly/nightly-scm.exheres-0
index adef4a9..587e8e1 100644
--- a/packages/net-www/nightly/nightly-scm.exheres-0
+++ b/packages/net-www/nightly/nightly-scm.exheres-0
@@ -11,6 +11,7 @@ PLATFORMS="~amd64"
DEFAULT_SRC_PREPARE_PATCHES=(
"${FILES}"/wayland.patch
"${FILES}"/gtk2less.patch
+ "${FILES}"/cpp.patch
)
src_configure() {