mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 03:09:51 +03:00
267021a720
Fix build error with `asm/elf.h` include.
```
In file included from elfexport.cpp:105:
/usr/include/asm/elf.h:14:15: error: expected constructor, destructor, or type conversion before '(' token
14 | _Static_assert(sizeof(struct x86_xfeat_component) % 4 == 0, "x86_xfeat_component is not aligned");
| ^
```
Upstream issue: https://github.com/polyml/polyml/issues/214
Thanks to Celeste for assistance with looking into the issue.
86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
Patch-Source: https://github.com/polyml/polyml/commit/a84a640e645f77c9160672696a796d805858914d
|
|
configure.ac hunk was adapted for 5.9.1.
|
|
---
|
|
From a84a640e645f77c9160672696a796d805858914d Mon Sep 17 00:00:00 2001
|
|
From: David Matthews <dm@prolingua.co.uk>
|
|
Date: Fri, 25 Apr 2025 20:06:55 +0100
|
|
Subject: [PATCH] Remove reference to include file asm/elf.h. This appears to
|
|
have been added to support an experimental version on Android but causes
|
|
problems on Fedora 42 and, apparently, Gentoo.
|
|
|
|
---
|
|
config.h.in | 3 ---
|
|
configure | 6 ------
|
|
configure.ac | 2 +-
|
|
libpolyml/elfexport.cpp | 7 +------
|
|
4 files changed, 2 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/config.h.in b/config.h.in
|
|
index 6a041358..73075e60 100644
|
|
--- a/config.h.in
|
|
+++ b/config.h.in
|
|
@@ -22,9 +22,6 @@
|
|
/* Define to 1 if you have the <arpa/inet.h> header file. */
|
|
#undef HAVE_ARPA_INET_H
|
|
|
|
-/* Define to 1 if you have the <asm/elf.h> header file. */
|
|
-#undef HAVE_ASM_ELF_H
|
|
-
|
|
/* Define to 1 if you have the <assert.h> header file. */
|
|
#undef HAVE_ASSERT_H
|
|
|
|
diff --git a/configure b/configure
|
|
index c550b203..df8acd98 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -20359,12 +20359,6 @@ if test "x$ac_cv_header_sys_elf_amd64_h" = xyes
|
|
then :
|
|
printf "%s\n" "#define HAVE_SYS_ELF_AMD64_H 1" >>confdefs.h
|
|
|
|
-fi
|
|
-ac_fn_c_check_header_compile "$LINENO" "asm/elf.h" "ac_cv_header_asm_elf_h" "$ac_includes_default"
|
|
-if test "x$ac_cv_header_asm_elf_h" = xyes
|
|
-then :
|
|
- printf "%s\n" "#define HAVE_ASM_ELF_H 1" >>confdefs.h
|
|
-
|
|
fi
|
|
ac_fn_c_check_header_compile "$LINENO" "machine/reloc.h" "ac_cv_header_machine_reloc_h" "$ac_includes_default"
|
|
if test "x$ac_cv_header_machine_reloc_h" = xyes
|
|
diff --git a/configure.ac b/configure.ac
|
|
index d091517d..ea837fcf 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -119,7 +119,7 @@ AC_CHECK_HEADERS([ieeefp.h io.h math.h memory.h netinet/tcp.h arpa/inet.h poll.h
|
|
AC_CHECK_HEADERS([stdarg.h sys/errno.h sys/filio.h sys/mman.h sys/resource.h])
|
|
AC_CHECK_HEADERS([sys/sockio.h sys/stat.h termios.h sys/times.h])
|
|
AC_CHECK_HEADERS([sys/types.h sys/uio.h sys/un.h sys/utsname.h sys/select.h sys/sysctl.h])
|
|
-AC_CHECK_HEADERS([sys/elf_SPARC.h sys/elf_386.h sys/elf_amd64.h asm/elf.h machine/reloc.h i386/elf_machdep.h])
|
|
+AC_CHECK_HEADERS([sys/elf_SPARC.h sys/elf_386.h sys/elf_amd64.h machine/reloc.h i386/elf_machdep.h])
|
|
AC_CHECK_HEADERS([mach-o/x86_64/reloc.h mach-o/arm64/reloc.h])
|
|
AC_CHECK_HEADERS([windows.h tchar.h semaphore.h])
|
|
AC_CHECK_HEADERS([stdint.h inttypes.h])
|
|
diff --git a/libpolyml/elfexport.cpp b/libpolyml/elfexport.cpp
|
|
index 7e32aeb6..ea65d942 100644
|
|
--- a/libpolyml/elfexport.cpp
|
|
+++ b/libpolyml/elfexport.cpp
|
|
@@ -2,7 +2,7 @@
|
|
Title: Write out a database as an ELF object file
|
|
Author: David Matthews.
|
|
|
|
- Copyright (c) 2006-7, 2011, 2016-18, 2020-21 David C. J. Matthews
|
|
+ Copyright (c) 2006-7, 2011, 2016-18, 2020-21, 2025 David C. J. Matthews
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
@@ -93,11 +93,6 @@
|
|
#include <sys/elf_amd64.h>
|
|
#endif
|
|
|
|
-// Android has the ARM relocation symbol here
|
|
-#ifdef HAVE_ASM_ELF_H
|
|
-#include <asm/elf.h>
|
|
-#endif
|
|
-
|
|
// NetBSD relocation symbols
|
|
#ifdef HAVE_I386_ELF_MACHDEP_H
|
|
#include <i386/elf_machdep.h>
|