Source: p11-kit
Version: 0.25.0-2
Severity: important
Justification: breaks architecture bootstrap
User: [email protected]
Usertags: ftcbfs
User: [email protected]
Usertags: rebootstrap
Tags: patch upstream

Hi,

p11-kit gained a new AC_RUN_IFELSE check and that happens to break cross
building and therefore also architecture bootstrap. I propose adding a
default result for this check (assuming that it usually will be cross
built for glibc) while making it modifiable using a cache variable. I'm
attaching a patch for your convenience.

Helmut
--- p11-kit-0.25.0.orig/configure.ac
+++ p11-kit-0.25.0/configure.ac
@@ -167,7 +167,8 @@
 
 	AC_CHECK_FUNC(
 		[strerror_r],
-		[AC_RUN_IFELSE(
+		[AC_CACHE_CHECK([strerror_r return value],[ac_cv_strerror_r_ret],[
+		     AC_RUN_IFELSE(
 			[AC_LANG_SOURCE([[
 				#include <errno.h>
 				#include <string.h>
@@ -178,10 +179,13 @@
 					return strerror_r (EINVAL, buf, 32);
 				}
 			]])],
+			[ac_cv_strerror_r_ret=xsi],
+			[ac_cv_strerror_r_ret=gnu],
+			[ac_cv_strerror_r_ret=cross])])
+		 dnl Guess that we cross build on glibc
+		 AS_IF([test "$ac_cv_strerror_r_ret" = xsi],
                         [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])],
-			[AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])],
-			[])],
-		[])
+			[AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])])])
 
 	AC_CACHE_CHECK([for thread-local storage class],
 		[ac_cv_tls_keyword],

Reply via email to