From: Tomas Krizek Date: Tue, 27 Feb 2018 17:08:00 +0000 (+0100) Subject: deb: drop unnecessary python3 patch X-Git-Tag: v2.2.0~16^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3571f7e09b44930ed79d09cd1b3bf21fbc13863;p=thirdparty%2Fknot-resolver.git deb: drop unnecessary python3 patch --- diff --git a/distro/deb/debian/patches/0003-look-for-modules-in-python3.patch b/distro/deb/debian/patches/0003-look-for-modules-in-python3.patch deleted file mode 100644 index a7ee39765..000000000 --- a/distro/deb/debian/patches/0003-look-for-modules-in-python3.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Daniel Kahn Gillmor -Date: Sat, 17 Feb 2018 18:41:56 -0500 -Subject: look for modules in python3 - -When building, we want to make sure we use python3 where possible, not -python 2.7. This is what the executable is named in debian. ---- - platform.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: knot-resolver/platform.mk -=================================================================== ---- knot-resolver.orig/platform.mk -+++ knot-resolver/platform.mk -@@ -200,7 +200,7 @@ endef - - # Find Python package - define find_pythonpkg -- HAS_$(1) := $(shell python -c "import $(1)" > /dev/null 2>&1 && echo yes || echo no) -+ HAS_$(1) := $(shell python3 -c "import $(1)" > /dev/null 2>&1 && echo yes || echo no) - endef - - define find_soname diff --git a/distro/deb/debian/patches/series b/distro/deb/debian/patches/series index 80d7dcbe8..e1032653c 100644 --- a/distro/deb/debian/patches/series +++ b/distro/deb/debian/patches/series @@ -1,3 +1,2 @@ 0001-avoid-shipping-duplicate-root.hints-and-icann-ca.pem.patch 0002-Update-documentation-of-keyfile-ro.patch -0003-look-for-modules-in-python3.patch