[apparmor] [patch] backport python3 compability patch to 2.8 branch

[Steve Beattie]

On Tue, May 07, 2013 at 10:51:01PM +0200, Christian Boltz wrote:
> > You probably also want to pull in trunk commit 2108 as well.
> 
> openSUSE seems to be better than Ubuntu - at least my test builds worked 
> without r2108 ;-)

Oddly enough, the 2.8 backported patch kicked off jenkins builds that
succeeded on 13.04 (as well as other releases). However, it makes
sense to me to use python-config if available.

> Anyway, r2108 is a small patch and looks good to me - I'd say 
> Skimmed-by: Christian Boltz <apparmor at cboltz.de>   ;-)
> (credits for this new patch review level go to Seth ;-)

To be explicit, the patch looks like so:

=== modified file 'libraries/libapparmor/m4/ac_python_devel.m4'
--- libraries/libapparmor/m4/ac_python_devel.m4	2012-06-12 12:56:57 +0000
+++ libraries/libapparmor/m4/ac_python_devel.m4	2013-01-29 23:21:47 +0000
@@ -79,6 +79,9 @@
         # Check for Python include path
         #
         AC_MSG_CHECKING([for Python include path])
+        if type $PYTHON-config; then
+                PYTHON_CPPFLAGS=`$PYTHON-config --includes`
+        fi
         if test -z "$PYTHON_CPPFLAGS"; then
                 python_path=`$PYTHON -c "import sys; import distutils.sysconfig;\
 sys.stdout.write('%s\n' % distutils.sysconfig.get_python_inc());"`
@@ -94,6 +97,9 @@
         # Check for Python library path
         #
         AC_MSG_CHECKING([for Python library path])
+        if type $PYTHON-config; then
+                PYTHON_LDFLAGS=`$PYTHON-config --ldflags`
+        fi
         if test -z "$PYTHON_LDFLAGS"; then
                 # (makes two attempts to ensure we've got a version number
                 # from the interpreter)

As nice as a skimmed-by review is, I admit to wanting a proper acked-by
statement, if possible. :)

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20130508/1b91bf7a/attachment.pgp>