summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorQuentin Glidic2017-07-15 15:58:34 +0200
committerQuentin Glidic2017-07-15 15:58:34 +0200
commit5dec4319ca1686d714ba07e40f4c795587276dae (patch)
tree849466aaa241dbedffbcba5c87ff60d26c5d9c3b /packages
parent22931bd9b92c95538b4193d99961813a8459a0c4 (diff)
downloadsardemff7-pending-5dec4319ca1686d714ba07e40f4c795587276dae.tar.xz
daily: Drop CPP patch
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.patch27
-rw-r--r--packages/net-www/nightly/files/cpp.patch27
3 files changed, 0 insertions, 55 deletions
diff --git a/packages/mail-client/daily/daily-scm.exheres-0 b/packages/mail-client/daily/daily-scm.exheres-0
index e010d11..35813c4 100644
--- a/packages/mail-client/daily/daily-scm.exheres-0
+++ b/packages/mail-client/daily/daily-scm.exheres-0
@@ -10,6 +10,5 @@ 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
deleted file mode 100644
index c8beeef..0000000
--- a/packages/mail-client/daily/files/cpp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/mozilla/build/buildconfig.py
-+++ b/mozilla/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/files/cpp.patch b/packages/net-www/nightly/files/cpp.patch
deleted file mode 100644
index faa4af2..0000000
--- a/packages/net-www/nightly/files/cpp.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-