Skip to content

Commit

Permalink
clang: update to curent Msys2 pkgrel 3
Browse files Browse the repository at this point in the history
This fixes git-for-windows/git#4733

Signed-off-by: Matthias Aßhauer <[email protected]>
  • Loading branch information
rimrul committed Dec 14, 2023
1 parent 1efd2fb commit c3b4ae9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 80 deletions.
75 changes: 0 additions & 75 deletions mingw-w64-clang/0005-aarch64-unwind-seh.patch

This file was deleted.

10 changes: 6 additions & 4 deletions mingw-w64-clang/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _version=17.0.6
_rc=
_tag=llvmorg-${_version}${_rc}
pkgver=${_version}${_rc/-/}
pkgrel=3
pkgrel=4
pkgdesc="C language family frontend for LLVM (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
Expand Down Expand Up @@ -179,10 +179,13 @@ build() {
FFI_INCLUDE_DIR=$(echo $FFI_INCLUDE_DIR | sed 's|-I||g')

if check_option "debug" "y"; then
common_cmake_args+=(-DCMAKE_BUILD_TYPE=Debug)
common_cmake_args+=(-DCMAKE_BUILD_TYPE=Debug
-DLLVM_ENABLE_ASSERTIONS=ON)
VERBOSE="VERBOSE=1"
else
common_cmake_args+=(-DCMAKE_BUILD_TYPE=MinSizeRel)
common_cmake_args+=(-DCMAKE_BUILD_TYPE=MinSizeRel
-DLLVM_ENABLE_ASSERTIONS=OFF
-DLLVM_ENABLE_DUMP=ON)
fi
common_cmake_args+=(-Wno-dev
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX}
Expand All @@ -192,7 +195,6 @@ build() {
-DPython3_FIND_REGISTRY=NEVER
-DPython3_ROOT_DIR=${MINGW_PREFIX}
-DFFI_INCLUDE_DIR="${FFI_INCLUDE_DIR}"
-DLLVM_ENABLE_ASSERTIONS=OFF
-DLLVM_ENABLE_FFI=ON
-DLLVM_INCLUDE_EXAMPLES=OFF
-DLLVM_INCLUDE_BENCHMARKS=OFF
Expand Down
3 changes: 2 additions & 1 deletion mingw-w64-clang/update-clang-from-msys2.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ mv upstream/$pkgname/README-patches.md ./ || die "$0: failed to replace existing

sed -e "s/pkgrel=[.0-9]\+\(.*\)/pkgrel=$new_pkgrel\1/" \
-e 's/-DCMAKE_BUILD_TYPE=Release/-DCMAKE_BUILD_TYPE=MinSizeRel/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=.*/-DLLVM_TARGETS_TO_BUILD=Native/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=".*"/-DLLVM_TARGETS_TO_BUILD=Native/' \
-e 's/-DLLVM_TARGETS_TO_BUILD=[A-Za-z0-9;]*/-DLLVM_TARGETS_TO_BUILD=Native/' \
-e 's/-DLLVM_ENABLE_SPHINX=ON/-DLLVM_ENABLE_SPHINX=OFF/'\
-e '/^check()/,/^}/d' \
-i PKGBUILD
Expand Down

0 comments on commit c3b4ae9

Please sign in to comment.