Merge lp:~peter-pearse/ubuntu/natty/guile-1.8/prop001 into lp:ubuntu/natty/guile-1.8

[Peter Pearse]

[Steve Langasek (vorlon)]

Is there a reason this can't be implemented using AC_CACHE_CHECK(), instead of referencing the variable directly in configure.in?

review: Needs Fixing

Unmerged revisions

22. By Peter Pearse on 2011-03-01

Add cache variable for cross build configure pthread_attr_getstack test.
Dont make check when cross building.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-17 14:19:09 +0000
+++ debian/changelog	2011-03-01 14:13:03 +0000
@@ -1,3 +1,11 @@
+guile-1.8 (1.8.7+1-3ubuntu4) maverick; urgency=low
+
+  * Add cache variable for cross build configure pthread_attr_getstack
+    test.
+  * Dont make check when cross building.
+
+ -- Peter Pearse <[e-mail]>  Tue, 01 Mar 2011 14:09:04 +0000
+
 guile-1.8 (1.8.7+1-3ubuntu3) natty; urgency=low
 
   * Backport from upstream:
 
=== added file 'debian/patches/cross.diff'
--- debian/patches/cross.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/cross.diff	2011-03-01 14:13:03 +0000
@@ -0,0 +1,62 @@
+diff -purN g/configure g_p//configure
+--- g/configure	2011-03-01 13:56:29.000000000 +0000
++++ g_p//configure	2011-03-01 14:01:25.000000000 +0000
+@@ -18855,6 +18855,9 @@ fi
+ 
+ ## Check whether pthread_attr_getstack works for the main thread
+ 
++# Work round for cross build
++if test -z "$ac_cv_pthread_attr_getstack_works"; then
++
+ if test "$with_threads" = pthreads; then
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_attr_getstack works for the main thread" >&5
+@@ -18914,6 +18917,19 @@ $as_echo "$works" >&6; }
+ 
+ fi # with_threads=pthreads
+ 
++else
++        if test "$ac_cv_pthread_attr_getstack_works" = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define PTHREAD_ATTR_GETSTACK_WORKS 1
++_ACEOF
++$as_echo "$as_me: #define PTHREAD_ATTR_GETSTACK_WORKS 1 -  from ac_cv_pthread_attr_getstack_works" >&5
++$as_echo "$as_me: #define PTHREAD_ATTR_GETSTACK_WORKS 1 -  from ac_cv_pthread_attr_getstack_works" >&5
++        else
++$as_echo "$as_me: #undefine PTHREAD_ATTR_GETSTACK_WORKS -  from ac_cv_pthread_attr_getstack_works" >&5
++$as_echo "$as_me: #undefine PTHREAD_ATTR_GETSTACK_WORKS -  from ac_cv_pthread_attr_getstack_works" >&5
++        fi
++fi # Cross build work round
+ 
+ ## Cross building
+ if test "$cross_compiling" = "yes"; then
+diff -purN g/configure.in g_p//configure.in
+--- g/configure.in	2011-03-01 13:56:29.000000000 +0000
++++ g_p//configure.in	2011-03-01 14:01:25.000000000 +0000
+@@ -1369,6 +1369,9 @@ AM_CONDITIONAL([BUILD_PTHREAD_SUPPORT],
+ 
+ ## Check whether pthread_attr_getstack works for the main thread
+ 
++# Work round for cross build
++if test -z "$ac_cv_pthread_attr_getstack_works": then
++
+ if test "$with_threads" = pthreads; then
+ 
+ AC_MSG_CHECKING(whether pthread_attr_getstack works for the main thread)
+@@ -1408,7 +1411,14 @@ CFLAGS="$old_CFLAGS"
+ AC_MSG_RESULT($works)
+ 
+ fi # with_threads=pthreads
+-
++else
++	if test "$ac_cv_pthread_attr_getstack_works" = yes; then
++		AC_DEFINE(PTHREAD_ATTR_GETSTACK_WORKS, [1], [Define when pthread_att_get_stack works for the main thread])
++		AC_MSG_RESULT("#define PTHREAD_ATTR_GETSTACK_WORKS 1 -  from ac_cv_pthread_attr_getstack_works")
++	else
++		AC_MSG_RESULT("#undef PTHREAD_ATTR_GETSTACK_WORKS - from ac_cv_pthread_attr_getstack_works")
++	fi
++fi # Cross build work round
+ 
+ ## Cross building	
+ if test "$cross_compiling" = "yes"; then
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-17 14:19:09 +0000
+++ debian/patches/series	2011-03-01 14:13:03 +0000
@@ -6,3 +6,4 @@
 fix-make-check-for-new-libltdl.diff
 doc-new-gcc.diff
 autofiles.diff
+cross.diff
 
=== modified file 'debian/rules'
--- debian/rules	2010-01-19 02:27:06 +0000
+++ debian/rules	2011-03-01 14:13:03 +0000
@@ -309,7 +309,11 @@
 debian/stamp/build: debian/stamp/config
 	$(checkdir)
 	$(MAKE) CFLAGS="$(deb_cflags) -Wno-error"
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 	unset SHELL && $(MAKE) check
+else
+	@echo "No check when cross building"
+endif
 	mkdir -p $(dir $@) && touch $@
 
 clean: