pthsem: fix compilation with autoconf >= 2.71

Sort of upstream backport.

Remove sjlj patches. These were fixed by overriding the var.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/libs/pthsem/Makefile b/libs/pthsem/Makefile
index f9f35a5c2ec9b778500cbddf31f1a10c3bc6f85f..67852aa6828ff6ab21dbdfd3befc8ac03b041900 100644 (file)
--- a/libs/pthsem/Makefile
+++ b/libs/pthsem/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pthsem
 PKG_VERSION:=2.0.8
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.auto.tuwien.ac.at/~mkoegler/pth/

diff --git a/libs/pthsem/patches/001-linux3x-fix.patch b/libs/pthsem/patches/001-linux3x-fix.patch
deleted file mode 100644 (file)
index 60aff54..0000000
--- a/libs/pthsem/patches/001-linux3x-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -892,6 +892,8 @@ case $PLATFORM in
-         case "x`uname -r`" in
- changequote(, )dnl
-             x2.[23456789]* ) ;;
-+changequote(, )dnl
-+            x3.* ) ;;
- changequote([, ])
-             * ) braindead=yes ;;
-         esac

diff --git a/libs/pthsem/patches/003-linux4x-fix.patch b/libs/pthsem/patches/003-linux4x-fix.patch
deleted file mode 100644 (file)
index 167ba4e..0000000
--- a/libs/pthsem/patches/003-linux4x-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -894,6 +894,8 @@ changequote(, )dnl
-             x2.[23456789]* ) ;;
- changequote(, )dnl
-             x3.* ) ;;
-+changequote(, )dnl
-+            x4.* ) ;;
- changequote([, ])
-             * ) braindead=yes ;;
-         esac

diff --git a/libs/pthsem/patches/010-autoconf272.patch b/libs/pthsem/patches/010-autoconf272.patch
new file mode 100644 (file)
index 0000000..71d24af
--- /dev/null
+++ b/libs/pthsem/patches/010-autoconf272.patch
@@ -0,0 +1,30 @@
+From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sun, 25 Feb 2024 14:33:02 +0100
+Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72
+
+Move fi statement where it belongs to fix the following build failure
+with autoconf >= 2.72:
+
+checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b
+
+Signed-off-by: Fabrice Fontaine <[email protected]>
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(s
+ ])
+ dnl #   restore original compile environment
+ CFLAGS="$OCFLAGS"
+-])dnl
+ fi
++])dnl
+ dnl #   extract result ingredients of single cached result value
+ type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'`
+ addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'`

diff --git a/libs/pthsem/patches/011-fix-error-check.patch b/libs/pthsem/patches/011-fix-error-check.patch
new file mode 100644 (file)
index 0000000..0ce84f7
--- /dev/null
+++ b/libs/pthsem/patches/011-fix-error-check.patch
@@ -0,0 +1,18 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -953,6 +953,7 @@ changequote(<<, >>)dnl
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <signal.h>
++#include <stdlib>
+ 
+ int main(int argc, char *argv[])
+ {
+@@ -1001,6 +1002,7 @@ changequote(<<, >>)dnl
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ int main(int argc, char *argv[])
+ {
+     FILE *fp;