summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2023-05-05 22:47:54 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2023-09-22 06:20:39 -0500
commit7d3c6b17cf0ea0fb3eaa2b86a465844639e44410 (patch)
tree6b63f5b82e56bb8484ccfbbdcc2763a50d44a704
parent046c54fa038459508fc3f1e2667370f208df4f31 (diff)
downloadpackages-7d3c6b17cf0ea0fb3eaa2b86a465844639e44410.tar.gz
packages-7d3c6b17cf0ea0fb3eaa2b86a465844639e44410.tar.bz2
packages-7d3c6b17cf0ea0fb3eaa2b86a465844639e44410.tar.xz
packages-7d3c6b17cf0ea0fb3eaa2b86a465844639e44410.zip
user/llvm14: Add patch for musl 1.2.4 compat
-rw-r--r--user/llvm14/APKBUILD4
-rw-r--r--user/llvm14/lfs64.patch16
2 files changed, 19 insertions, 1 deletions
diff --git a/user/llvm14/APKBUILD b/user/llvm14/APKBUILD
index cd8d6d7a0..82065be01 100644
--- a/user/llvm14/APKBUILD
+++ b/user/llvm14/APKBUILD
@@ -6,7 +6,7 @@ _pkgname=llvm
pkgver=14.0.6
_majorver=${pkgver%%.*}
pkgname=$_pkgname$_majorver
-pkgrel=0
+pkgrel=1
pkgdesc="Low Level Virtual Machine compiler system, version $_majorver"
url="https://llvm.org/"
arch="all"
@@ -26,6 +26,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l
dwarf-info.patch
dyld-elf-ppc32.patch
hexagon.patch
+ lfs64.patch
macho32.patch
musl-ppc64-elfv2.patch
ppc-test.patch
@@ -253,6 +254,7 @@ caeec8e4dbd92f5f74940780b69075f3879a267a8623822cbdc193fd14706eb089071e3a5a20d60c
2842bcef71fb962cb49717fa9ba3e7318400c4a9175284a39ae3ff13a00260556794d0d63341430b2c64a0bca1ac76186e02c92e444a737a5dec1b6de27bbc60 dwarf-info.patch
5fa36157f7a76ca70d22af7bd96850db454d6add3a19cc3272962633c453087015755ca9df0de29cc40359e89279e470e91ff1a69d1453596a73291b36f39b23 dyld-elf-ppc32.patch
9abe376068801a09b2af01eef0cd319f48862b5ff7cce62af3cf4e7597a0898842125ae574577b545734ec1381f192b924b4f717a9c094f119e32ada81a2b9a2 hexagon.patch
+a45f0783bd364b6a55b2d6c8cc69f874297536ed034482776f361c83d1bf9da4c9343a69eda771c2017991f58919ad3e859250c7a962aec8aeac7c33e567f472 lfs64.patch
de9791cc476817782b553c4edab696132da4ed2b9a3d80dbf1b85b7dc7a8c5e4caf14f2f26e33c27cd80a91b36709d3b24caea910c0a6315ffbb297cb748468d macho32.patch
e5ddbc4b6c4928e79846dc3c022eb7928aaa8fed40515c78f5f03b8ab8264f34f1eb8aa8bfc0f436450932f4917e54ad261603032092ea271d9590f11a37cf1e musl-ppc64-elfv2.patch
62de403e4cfd58d9f33f8b35ff31f66c906fd39c667fbcfa394d03f636fb10977c2f53c3a780d0c8e099f9a081951402757e12842d82a7cbd1aef4158f51d5c2 ppc-test.patch
diff --git a/user/llvm14/lfs64.patch b/user/llvm14/lfs64.patch
new file mode 100644
index 000000000..6e0770daa
--- /dev/null
+++ b/user/llvm14/lfs64.patch
@@ -0,0 +1,16 @@
+musl >= 1.2.4 only defines lseek64 and friends if _LARGEFILE64_SOURCE is
+defined. This causes the symbol check to "succeed" but compilation to
+later fail.
+
+--- llvm-14.0.6.src/cmake/config-ix.cmake.old 2022-06-22 11:46:24.000000000 -0500
++++ llvm-14.0.6.src/cmake/config-ix.cmake 2023-05-05 21:36:46.662084291 -0500
+@@ -250,9 +250,7 @@
+ if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
+ check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
+ endif()
+-set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE")
+ check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64)
+-set(CMAKE_REQUIRED_DEFINITIONS "")
+ check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
+ check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
+ check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2)