From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 Jul 2013 16:06:05 +0000 (+0200)
Subject: arm: Don't require distutils.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e955b31157f58695d3a023903ea55997efc3198f;p=people%2Fms%2Fipfire-2.x.git

arm: Don't require distutils.

We don't have that module shipped and we don't really
need it for arm either.
---

diff --git a/lfs/arm b/lfs/arm
index 3c042a42e4..2fbf65eacd 100644
--- a/lfs/arm
+++ b/lfs/arm
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch
 	cd $(DIR_APP) && ./install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/patches/arm-dont-require-distutils.patch b/src/patches/arm-dont-require-distutils.patch
new file mode 100644
index 0000000000..1fe2b8affb
--- /dev/null
+++ b/src/patches/arm-dont-require-distutils.patch
@@ -0,0 +1,20 @@
+diff -Nur arm.vanilla/src/util/hostnames.py arm/src/util/hostnames.py
+--- arm.vanilla/src/util/hostnames.py	2012-04-29 05:59:24.000000000 +0200
++++ arm/src/util/hostnames.py	2013-07-31 17:59:19.245591564 +0200
+@@ -30,7 +30,6 @@
+ import threading
+ import itertools
+ import Queue
+-import distutils.sysconfig
+ 
+ from util import log, sysTools
+ 
+@@ -264,7 +263,7 @@
+     # 'socket.gethostbyaddr'. The following checks if the system has the
+     # gethostbyname_r function, which determines if python resolutions can be
+     # done in parallel or not. If so, this is preferable.
+-    isSocketResolutionParallel = distutils.sysconfig.get_config_var("HAVE_GETHOSTBYNAME_R")
++    isSocketResolutionParallel = True #distutils.sysconfig.get_config_var("HAVE_GETHOSTBYNAME_R")
+     self.useSocketResolution = CONFIG["queries.hostnames.useSocketModule"] and isSocketResolutionParallel
+     
+     for _ in range(CONFIG["queries.hostnames.poolSize"]):