summaryrefslogtreecommitdiff
path: root/sys-devel/distcc
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/distcc')
-rw-r--r--sys-devel/distcc/Manifest1
-rw-r--r--sys-devel/distcc/files/distcc-3.4-pump-tests.patch153
2 files changed, 0 insertions, 154 deletions
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 3511a53d058e..cf0c9ad5a915 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,7 +1,6 @@
AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14
AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860
AUX distcc-3.4-fix-dcc_gcc_rewrite_fqn-corruption.patch 2846 BLAKE2B 228501a60a28eca8fa0f342df4469dd14e691c32d5e8b33a142e3b5a4f7fa870a6ca0e7c4b79e28fd9d643597d4610ee7210bda227b3a9a9f0e0f78d50d57c1b SHA512 dd729bdec51da0d7d06379c4038b8df88900f7b2255d34d5e06ce6fdb349a2b32b264a4d05788ac558233a6379ab5f28baae4a29882e6857acbfc4dfeced143f
-AUX distcc-3.4-pump-tests.patch 5922 BLAKE2B 17e755c3a6c04465a6c0be1e2657eb92d3a25e871eb62750d4a379290c01c6939ad55feb76a76b35b66d366aedaa64e4b7d63143be412a93a22448d33c819271 SHA512 8d2a6e5a5ac219fad327919344d68274243337fabd6361ee6355be658e2503d6d3657d8adb285dc40105b0916096bb9b21e93f544fb7342dcf9ac03c70c6a4fc
AUX distcc-3.4-rewrite-chost.patch 2934 BLAKE2B 88289d943bfb4824a2b42654c2cd0ce9e3a797551b5589396d15e5094294210729c941d1309078981c8cc4679c347f4f5b6037af47d0b97ed2c60d6dd0da7023 SHA512 9573211d5bb2ae606af2d1ba19a78f7d7498e7755f6a922d7c544f5c9daae3e0463438739958e59f7b25fcc13615723d83fe4d3a1e2f6fc4997c6680f9ac9f81
AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946
AUX distcc-config-r1 5213 BLAKE2B 352534097ecd8ecfe3306df169afcf4896a4f8550e021d1acdb73b2ab3efe4c028b361664022e35c23f509bbba60cea8a38299a51d40012bf57a367c04bae3ee SHA512 f829e2962884585b7fdf6751728e1cc895c51687d05a3028334b1804dda0968e3c5e9d30ebe12b0c95be44d8739fce93605033fcdc3ed34a90755165ce18288b
diff --git a/sys-devel/distcc/files/distcc-3.4-pump-tests.patch b/sys-devel/distcc/files/distcc-3.4-pump-tests.patch
deleted file mode 100644
index db392b7f3632..000000000000
--- a/sys-devel/distcc/files/distcc-3.4-pump-tests.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-https://github.com/distcc/distcc/pull/460
-
-From 45d9c4a1ef66451ed45a6afdec7098ed02082390 Mon Sep 17 00:00:00 2001
-From: Rosen Matev <rosen.matev@cern.ch>
-Date: Fri, 29 Apr 2022 15:42:28 +0200
-Subject: [PATCH] Fix tests in pump mode
-
-`make check` is also running tests for the pump mode
-(`pump-maintainer-check` target) but they were all falling back to
-the usual preprocessor mode as the include server was not started.
-
-This is solved by prepending `pump` to the distcc invocations and
-also some trivially failing tests are fixed or disabled when they
-make no sense in pump mode.
----
- Makefile.in | 2 +-
- pump.in | 13 +++++++++++--
- test/testdistcc.py | 28 ++++++++++++++++++++++++----
- 3 files changed, 36 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index f240ca6f..79e28380 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -583,7 +583,7 @@ distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
- # the distcc version, the source location, the CPP flags (for location of the
- # includes), and the build location.
- include-server:
-- if test -z "$(PYTHON)"; then \
-+ @if test -z "$(PYTHON)"; then \
- echo "Not building $@: No suitable python found"; \
- else \
- mkdir -p "$(include_server_builddir)" && \
-diff --git a/pump.in b/pump.in
-index 8e46f458..08a32c0e 100755
---- a/pump.in
-+++ b/pump.in
-@@ -218,7 +218,9 @@ PrintIncludeServerStatusMessage() {
- }
-
- Announce() {
-- echo "__________Using distcc-pump from $DISTCC_LOCATION"
-+ if [ "$verbose" = 1 ]; then
-+ echo "__________Using distcc-pump from $DISTCC_LOCATION"
-+ fi
- }
-
- # Starts up the include server. Sets $socket, $socket_dir, and
-@@ -359,7 +361,9 @@ ShutDown() {
- # Always -- at exit -- shut down include_server and remove $socket_dir
- if [ -n "$include_server_pid" ] && \
- ps -p "$include_server_pid" > /dev/null; then
-- echo '__________Shutting down distcc-pump include server'
-+ if [ "$verbose" = 1 ]; then
-+ echo '__________Shutting down distcc-pump include server'
-+ fi
- kill $include_server_pid
- # Wait until it's really dead. We need to do this because the
- # include server may produce output after receiving SIGTERM.
-@@ -508,6 +512,11 @@ Main() {
-
- Initialize
-
-+ # Do not write on stdout if we're testing pump mode
-+ if [ "0$DISTCC_TESTING_INCLUDE_SERVER" -ne "0" ]; then
-+ verbose=0
-+ fi
-+
- case "$*" in
- --startup)
- # Don't put ordinary progress messages on stdout,
-diff --git a/test/testdistcc.py b/test/testdistcc.py
-index dfdf2f13..6377d0b6 100755
---- a/test/testdistcc.py
-+++ b/test/testdistcc.py
-@@ -258,7 +258,11 @@ def valgrind(self):
- return _valgrind_command;
-
- def distcc(self):
-- return self.valgrind() + "distcc "
-+ if "cpp" not in _server_options:
-+ return self.valgrind() + "distcc "
-+ else:
-+ return "DISTCC_TESTING_INCLUDE_SERVER=1 " + self.valgrind() + "pump distcc "
-+
-
- def distccd(self):
- return self.valgrind() + "distccd "
-@@ -422,6 +426,11 @@ class BogusOption_Case(SimpleDistCC_Case):
- Now that we support implicit compilers, this is passed to gcc,
- which returns a non-zero status."""
- def runtest(self):
-+ # Disable the test in pump mode since the pump wrapper fails
-+ # before we can run distcc.
-+ if "cpp" in _server_options:
-+ raise comfychair.NotRunError('pump wrapper expects DISTCC_HOSTS')
-+
- error_rc, _, _ = self.runcmd_unchecked(self._cc + " --bogus-option")
- assert error_rc != 0
- self.runcmd(self.distcc() + self._cc + " --bogus-option", error_rc)
-@@ -432,7 +441,7 @@ def runtest(self):
- class CompilerOptionsPassed_Case(SimpleDistCC_Case):
- """Test that options following the compiler name are passed to the compiler."""
- def runtest(self):
-- out, err = self.runcmd("DISTCC_HOSTS=localhost "
-+ out, err = self.runcmd("DISTCC_HOSTS=localhost%s " % _server_options
- + self.distcc()
- + self._cc + " --help")
- if re.search('distcc', out):
-@@ -1422,7 +1431,8 @@ def source(self):
-
- def setupEnv(self):
- Compilation_Case.setupEnv(self)
-- os.environ['DISTCC_HOSTS'] = '127.0.0.1:%d,lzo' % self.server_port
-+ os.environ['DISTCC_HOSTS'] = (
-+ '127.0.0.1:%d,lzo' % self.server_port + _server_options)
-
- class DashONoSpace_Case(CompileHello_Case):
- def compileCmd(self):
-@@ -1525,6 +1535,11 @@ def source(self):
- """
-
- def runtest(self):
-+ # Disable the test in pump mode since the pump wrapper fails
-+ # before we can run distcc.
-+ if "cpp" in _server_options:
-+ raise comfychair.NotRunError('pump wrapper expects DISTCC_HOSTS')
-+
- # -P means not to emit linemarkers
- self.runcmd(self.distcc()
- + self._cc + " -E testtmp.c -o testtmp.out")
-@@ -1828,7 +1843,7 @@ class NoServer_Case(CompileHello_Case):
- """Invalid server name"""
- def setup(self):
- self.stripEnvironment()
-- os.environ['DISTCC_HOSTS'] = 'no.such.host.here'
-+ os.environ['DISTCC_HOSTS'] = 'no.such.host.here' + _server_options
- self.distcc_log = 'distcc.log'
- os.environ['DISTCC_LOG'] = self.distcc_log
- self.createSource()
-@@ -1874,6 +1889,11 @@ class NoHosts_Case(CompileHello_Case):
- We expect compilation to succeed, but with a warning that it was
- run locally."""
- def runtest(self):
-+ # Disable the test in pump mode since the pump wrapper fails
-+ # before we can run distcc.
-+ if "cpp" in _server_options:
-+ raise comfychair.NotRunError('pump wrapper expects DISTCC_HOSTS')
-+
- # WithDaemon_Case sets this to point to the local host, but we
- # don't want that. Note that you cannot delete environment
- # keys in Python1.5, so we need to just set them to the empty
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 21:34:28 +0000