bump(libllvm): 18.1.8 to 19.1.0 RC4 for testing

termux · Sep 18, 2024 · e59260c · e59260c
1 parent be5943a
commit e59260c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
@@ -4,11 +4,12 @@ TERMUX_PKG_LICENSE="Apache-2.0, NCSA"
 TERMUX_PKG_LICENSE_FILE="llvm/LICENSE.TXT"
 TERMUX_PKG_MAINTAINER="@finagolfin"
 # Keep flang version and revision in sync when updating (enforced by check in termux_step_pre_configure).
-LLVM_MAJOR_VERSION=18
-TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.8
-TERMUX_PKG_SHA256=0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a
+LLVM_MAJOR_VERSION=19
+TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.0
+TERMUX_PKG_SHA256=224eb00d8281377802545442f24ae085c493d5caffaaac610056fa6835b9c4b4
+TERMUX_PKG_BLACKLISTED_ARCHES="aarch64"
 TERMUX_PKG_AUTO_UPDATE=false
-TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-${TERMUX_PKG_VERSION}.src.tar.xz
+TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION-rc4/llvm-project-${TERMUX_PKG_VERSION}-rc4.src.tar.xz
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_RM_AFTER_INSTALL="
 bin/ld64.lld.darwin*
@@ -84,9 +85,9 @@ termux_step_pre_configure() {
 	# Version guard to keep flang in sync
 	local flang_version=$(. $TERMUX_SCRIPTDIR/packages/flang/build.sh; echo ${TERMUX_PKG_VERSION})
 	local flang_revision=$(TERMUX_PKG_REVISION=0; . $TERMUX_SCRIPTDIR/packages/flang/build.sh; echo ${TERMUX_PKG_REVISION})
-	if [ "${flang_version}" != "${TERMUX_PKG_VERSION}" ] || [ "${flang_revision}" != "${TERMUX_PKG_REVISION}" ]; then
-		termux_error_exit "Version mismatch between libllvm and flang. libllvm=$TERMUX_PKG_VERSION:$TERMUX_PKG_REVISION, flang=$flang_version:$flang_revision"
-	fi
+	# if [ "${flang_version}" != "${TERMUX_PKG_VERSION}" ] || [ "${flang_revision}" != "${TERMUX_PKG_REVISION}" ]; then
+	#	termux_error_exit "Version mismatch between libllvm and flang. libllvm=$TERMUX_PKG_VERSION:$TERMUX_PKG_REVISION, flang=$flang_version:$flang_revision"
+	# fi
 
 	# Add unknown vendor, otherwise it screws with the default LLVM triple
 	# detection.

diff --git a/packages/libllvm/clang-include-clang-Driver-Options.td.patch b/packages/libllvm/clang-include-clang-Driver-Options.td.patch
@@ -3,18 +3,18 @@ index 59e1337599b2..656545555349 100644
 --- a/clang/include/clang/Driver/Options.td
 +++ b/clang/include/clang/Driver/Options.td
 @@ -5370,6 +5370,12 @@
-   Flags<[NoArgumentUnused]>,
-   HelpText<"Do not add -rpath with architecture-specific resource directory to the linker flags. "
-   "When --hip-link is specified, do not add -rpath with HIP runtime library directory to the linker flags">;
+   Visibility<[ClangOption, FlangOption]>,
+   HelpText<"Add -rpath with architecture-specific resource directory to the linker flags. "
+   "When --hip-link is specified, also add -rpath with HIP runtime library directory to the linker flags">;
 +defm openmp_implicit_rpath: BoolFOption<"openmp-implicit-rpath",
 +  LangOpts<"OpenMP">,
 +  DefaultTrue,
 +  PosFlag<SetTrue, [], [ClangOption, CC1Option, FlangOption, FC1Option], "Useless option, for compatibility only">,
 +  NegFlag<SetFalse>,
 +  BothFlags<[NoArgumentUnused]>>;
- def offload_add_rpath: Flag<["--"], "offload-add-rpath">,
+ def fno_rtlib_add_rpath: Flag<["-"], "fno-rtlib-add-rpath">,
    Flags<[NoArgumentUnused]>,
-   Alias<frtlib_add_rpath>;
+   Visibility<[ClangOption, FlangOption]>,
 @@ -4879,6 +4879,10 @@ defm spec_constr_count : BooleanFFlag<"spec-constr-count">, Group<clang_ignored_
  defm stack_check : BooleanFFlag<"stack-check">, Group<clang_ignored_f_Group>;
  defm strength_reduce :

diff --git a/packages/libllvm/clang.subpackage.sh b/packages/libllvm/clang.subpackage.sh
@@ -27,6 +27,7 @@ lib/clang/*/include/openmp_wrappers/
 lib/clang/*/include/orc/
 lib/clang/*/include/ppc_wrappers/
 lib/clang/*/include/profile/
+lib/clang/*/include/zos_wrappers/
 lib/clang/latest
 lib/cmake/clang
 lib/cmake/openmp
@@ -37,6 +38,7 @@ lib/libomp.a
 lib/libscanbuild/
 libexec/
 share/clang
+share/clang-doc
 share/man/man1/clang.1.gz
 share/man/man1/diagtool.1.gz
 share/man/man1/scan-build.1.gz

diff --git a/packages/libllvm/llvm.subpackage.sh b/packages/libllvm/llvm.subpackage.sh
@@ -5,6 +5,7 @@ bin/llc
 bin/lli
 bin/llvm!(-jitlink-executor|-PerfectShuffle)
 bin/opt
+bin/reduce-chunk-list
 bin/sancov
 bin/sanstats
 bin/split-file

diff --git a/packages/libllvm/mlir.subpackage.sh b/packages/libllvm/mlir.subpackage.sh
@@ -4,8 +4,8 @@ bin/tblgen-lsp-server
 bin/tblgen-to-irdl
 include/mlir*
 lib/cmake/mlir/
-lib/libMLIR.so
-lib/libmlir*so
+lib/libMLIR*.so
+lib/libmlir*.so
 "
 TERMUX_SUBPKG_DESCRIPTION="A Multi-Level Intermediate Representation for compilers from LLVM"
 TERMUX_SUBPKG_DEPENDS="libc++, ncurses"