[Pkg-sssd-devel] [Git][sssd-team/sssd][master] 2 commits: fix-python3.8-ftbfs.diff: Fix build against python3.8.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at Debian SSSD packaging / sssd


Commits:
952342a5 by Timo Aaltonen at 2020-03-06T21:49:33+02:00
fix-python3.8-ftbfs.diff: Fix build against python3.8.

- - - - -
2aea1934 by Timo Aaltonen at 2020-03-06T21:58:36+02:00
releasing package sssd version 2.2.3-2

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix-python3.8-ftbfs.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,11 @@
-sssd (2.2.3-2) UNRELEASED; urgency=medium
+sssd (2.2.3-2) unstable; urgency=medium
 
   * libnss-sss: Add an entry for automounter to nsswitch.conf. This is
     needed by ipa-client-automount.
   * Added gitlab-ci.yml.
+  * fix-python3.8-ftbfs.diff: Fix build against python3.8.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Feb 2020 21:09:23 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 06 Mar 2020 21:58:28 +0200
 
 sssd (2.2.3-1.1) unstable; urgency=medium
 


=====================================
debian/patches/fix-python3.8-ftbfs.diff
=====================================
@@ -0,0 +1,36 @@
+commit 4dbfaae4379eda8b3b7debd37b338e8d384e2a77
+Author: Andreas Hasenack <andreas at canonical.com>
+Date:   Wed Jan 29 09:43:47 2020 -0300
+
+    Fix another build failure with python 3.8
+    
+    The parsing of python3-config --ldflags would break if multiple -L
+    path components were present. This change loops over these paths
+    until it finds the correct one.
+    
+    Fixes https://pagure.io/SSSD/sssd/issue/4147
+    
+    Reviewed-by: Pavel Březina <pbrezina at redhat.com>
+
+diff --git a/src/external/python.m4 b/src/external/python.m4
+index c20054417..1738f9f8f 100644
+--- a/src/external/python.m4
++++ b/src/external/python.m4
+@@ -36,10 +36,13 @@ path. If you want to build sssd without $1 bindings then specify
+     if test $? -eq 0; then
+         PYTHON_DLOPEN_LIB="` $PYTHON_CONFIG --libs --embed | grep -o -- '-lpython@<:@^ @:>@*' |sed -e 's/^-l/lib/'`"
+         if test x"$PYTHON_DLOPEN_LIB" != x; then
+-            python_lib_path="` $PYTHON_CONFIG --ldflags | grep -o -- '-L/@<:@^ @:>@*' | sed -e 's/^-L//'`"
+-            if test x"$python_lib_path" != x; then
+-                PYTHON_DLOPEN_LIB=$python_lib_path"/"$PYTHON_DLOPEN_LIB
+-            fi
++            python_lib_paths="` $PYTHON_CONFIG --ldflags | grep -o -- '-L/@<:@^ @:>@*' | sed -e 's/^-L//'`"
++            for p in $python_lib_paths; do
++                if test -e $p"/"$PYTHON_DLOPEN_LIB; then
++                    PYTHON_DLOPEN_LIB=$p"/"$PYTHON_DLOPEN_LIB
++                    break
++                fi
++            done
+             PYTHON_DLOPEN_LIB=$PYTHON_DLOPEN_LIB".so"
+             AC_DEFINE_UNQUOTED([PYTHON_DLOPEN_LIB], ["$PYTHON_DLOPEN_LIB"], [The path of libpython for dlopen-tests])
+         fi


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
+fix-python3.8-ftbfs.diff
 fix-whitespace-test.diff
 default-to-socket-activated-services.diff
 fix-946847.diff



View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/008cd9074a96c7ed4ce83022b6884010ec55bf07...2aea1934cc1b14e4f78f1895318c857f8907db3f

-- 
View it on GitLab: https://salsa.debian.org/sssd-team/sssd/-/compare/008cd9074a96c7ed4ce83022b6884010ec55bf07...2aea1934cc1b14e4f78f1895318c857f8907db3f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-sssd-devel/attachments/20200306/91959111/attachment-0001.html>