From: Camm Maguire <camm@debian.org>
Date: Sun, 13 Nov 2022 12:55:14 +0000 (+0000)
Subject: <short summary of the patch>
X-Git-Tag: archive/raspbian/2.7.1-4+rpi1~2^2^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e96a172a9164dc0645385a2e3ff1f81cd95d9fc;p=gcl27.git

<short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-121) unstable; urgency=medium

  * Version_2.6.13pre121

Gbp-Pq: Name Version_2.6.13pre121
---

diff --git a/configure b/configure
index 6480209..c7d49cd 100755
--- a/configure
+++ b/configure
@@ -4552,15 +4552,12 @@ add_args_to_cflags  -fsigned-char -pipe -fcommon \
 
 add_args_to_ldflags -no-pie # -Wl,-z,lazy
 
-CC=gcc
-GCL_CC=gcc
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline semantics" >&5
 printf %s "checking for inline semantics... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-			extern inline int foo(int i) {return i;}
+			inline int foo(int i) {return i;}
 
 			int
 			bar(int i) {return foo(i);}
@@ -4568,17 +4565,14 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  if ! `nm conftest.o |grep -q "T foo"` ; then
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: old" >&5
-printf "%s\n" "old" >&6; }
-
-printf "%s\n" "#define OLD_INLINE 1" >>confdefs.h
-
+  if `nm conftest.o |grep foo |awk '{if (NF==3) exit(-1)}'` ; then
+    	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: new" >&5
+printf "%s\n" "new" >&6; }
      else
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-	    			inline int foo(int i) {return i;}
+	    			extern inline int foo(int i) {return i;}
 
 				int
 				bar(int i) {return foo(i);}
@@ -4586,9 +4580,12 @@ printf "%s\n" "#define OLD_INLINE 1" >>confdefs.h
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"
 then :
-  if ! `nm conftest.o |grep -q "T foo"` ; then
-	    	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: new" >&5
-printf "%s\n" "new" >&6; }
+  if `nm conftest.o |grep foo |awk '{if (NF==3) exit(-1)}'` ; then
+	    	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: old" >&5
+printf "%s\n" "old" >&6; }
+
+printf "%s\n" "#define OLD_INLINE 1" >>confdefs.h
+
 	     else
 	       	as_fn_error $? "need working inline semantics" "$LINENO" 5
 	     fi
diff --git a/configure.in b/configure.in
index 08c1459..4785dd6 100644
--- a/configure.in
+++ b/configure.in
@@ -266,24 +266,24 @@ add_args_to_ldflags -no-pie # -Wl,-z,lazy
 AC_MSG_CHECKING([for inline semantics])
 AC_COMPILE_IFELSE(
     [AC_LANG_SOURCE([[
-			extern inline int foo(int i) {return i;}
+			inline int foo(int i) {return i;}
 
 			int
 			bar(int i) {return foo(i);}
 		     ]])],
-    [if ! `nm conftest.o |grep -q "T foo"` ; then
-	AC_MSG_RESULT([old])
-	AC_DEFINE([OLD_INLINE],[1],[extern inline semantics])
+    [if `nm conftest.o |grep foo |awk '{if (NF==3) exit(-1)}'` ; then
+    	AC_MSG_RESULT([new])
      else
 	AC_COMPILE_IFELSE(
 	    [AC_LANG_SOURCE([[
-	    			inline int foo(int i) {return i;}
+	    			extern inline int foo(int i) {return i;}
 
 				int
 				bar(int i) {return foo(i);}
 			    ]])],
-	    [if ! `nm conftest.o |grep -q "T foo"` ; then
-	    	AC_MSG_RESULT([new])
+	    [if `nm conftest.o |grep foo |awk '{if (NF==3) exit(-1)}'` ; then
+	    	AC_MSG_RESULT([old])
+		AC_DEFINE([OLD_INLINE],[1],[extern inline semantics])
 	     else
 	       	AC_MSG_ERROR([need working inline semantics])
 	     fi],