From 8f045875fb540103a7b9ddfa241d6f59f9ef75bf Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Mon, 25 Oct 2021 07:50:07 -0700 Subject: apparmor: Add a python 3.10 compatability patch Signed-off-by: Armin Kuster --- recipes-mac/AppArmor/apparmor_3.0.1.bb | 4 +-- recipes-mac/AppArmor/files/py3_10_fixup.patch | 35 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 recipes-mac/AppArmor/files/py3_10_fixup.patch diff --git a/recipes-mac/AppArmor/apparmor_3.0.1.bb b/recipes-mac/AppArmor/apparmor_3.0.1.bb index dca53a3..389e72a 100644 --- a/recipes-mac/AppArmor/apparmor_3.0.1.bb +++ b/recipes-mac/AppArmor/apparmor_3.0.1.bb @@ -16,15 +16,15 @@ DEPENDS = "bison-native apr gettext-native coreutils-native swig-native" SRC_URI = " \ git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \ file://run-ptest \ - file://disable_perl_h_check.patch \ file://crosscompile_perl_bindings.patch \ file://0001-Makefile.am-suppress-perllocal.pod.patch \ file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \ file://0001-Makefile-fix-hardcoded-installation-directories.patch \ file://0001-rc.apparmor.debian-add-missing-functions.patch \ + file://py3_10_fixup.patch \ " -SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e" +SRCREV = "b23de501807b8b5793e9654da8688b5fd3281154" S = "${WORKDIR}/git" PARALLEL_MAKE = "" diff --git a/recipes-mac/AppArmor/files/py3_10_fixup.patch b/recipes-mac/AppArmor/files/py3_10_fixup.patch new file mode 100644 index 0000000..05f8460 --- /dev/null +++ b/recipes-mac/AppArmor/files/py3_10_fixup.patch @@ -0,0 +1,35 @@ +m4/ax_python_devel.m4: do not check for distutils + +With py 3.10 this prints a deprecation warning which is +taken as an error. Upstream should rework the code to not +use distuils. + +Upstream-Status: Inappropriate [needs a proper fix upstream] +Signed-off-by: Armin Kuster + +Index: git/libraries/libapparmor/m4/ac_python_devel.m4 +=================================================================== +--- git.orig/libraries/libapparmor/m4/ac_python_devel.m4 ++++ git/libraries/libapparmor/m4/ac_python_devel.m4 +@@ -66,21 +66,6 @@ variable to configure. See ``configure - + fi + + # +- # Check if you have distutils, else fail +- # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". +-Please check your Python installation. The error was: +-$ac_distutils_result]) +- PYTHON_VERSION="" +- fi +- +- # + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) -- cgit v1.2.3-54-g00ecf