diff --git a/windows/mingw-w64-sleef-git/0001-Use-addSuffix-in-place-of-cat-type.patch b/windows/mingw-w64-sleef-git/0001-Use-addSuffix-in-place-of-cat-type.patch deleted file mode 100644 index 6262e5f..0000000 --- a/windows/mingw-w64-sleef-git/0001-Use-addSuffix-in-place-of-cat-type.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 317c9fbca66da298cb9b952b49681461cde9b1c7 Mon Sep 17 00:00:00 2001 -From: Yichao Yu -Date: Fri, 9 Jul 2021 05:30:53 +0800 -Subject: [PATCH 1/2] Use `addSuffix` in place of cat/type - -Similar to 75b62aafe98279b1df636b1aaa330189ef637e53 (#396) for better support of MinGW. - -This fixes the regression caused by #266 when building for mingw under msys2. ---- - src/libm/CMakeLists.txt | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/libm/CMakeLists.txt b/src/libm/CMakeLists.txt -index fe0a5d3..76412fa 100644 ---- a/src/libm/CMakeLists.txt -+++ b/src/libm/CMakeLists.txt -@@ -182,12 +182,7 @@ foreach(SIMD ${SLEEF_HEADER_LIST}) - list(APPEND SLEEF_HEADER_COMMANDS COMMAND $ ${HEADER_PARAMS_${SIMD}} >> ${SLEEF_INCLUDE_HEADER}) - endforeach() - --if((MSVC OR MINGW AND WIN32) OR SLEEF_CLANG_ON_WINDOWS) -- string(REPLACE "/" "\\" sleef_footer_input_file "${SLEEF_ORG_FOOTER}") -- list(APPEND SLEEF_HEADER_COMMANDS COMMAND type ${sleef_footer_input_file} >> ${SLEEF_INCLUDE_HEADER}) --else() -- list(APPEND SLEEF_HEADER_COMMANDS COMMAND cat ${SLEEF_ORG_FOOTER} >> ${SLEEF_INCLUDE_HEADER}) --endif() -+list(APPEND SLEEF_HEADER_COMMANDS COMMAND $ ${SLEEF_ORG_FOOTER} >> ${SLEEF_INCLUDE_HEADER}) - - add_custom_command(OUTPUT ${SLEEF_INCLUDE_HEADER} - ${SLEEF_HEADER_COMMANDS} -@@ -195,6 +190,7 @@ add_custom_command(OUTPUT ${SLEEF_INCLUDE_HEADER} - ${SLEEF_ORG_HEADER} - ${SLEEF_ORG_FOOTER} - ${TARGET_MKRENAME} -+ addSuffix - ) - - # -------------------------------------------------------------------- --- -2.32.0 - diff --git a/windows/mingw-w64-sleef-git/PKGBUILD b/windows/mingw-w64-sleef-git/PKGBUILD index 8a23635..d9af745 100644 --- a/windows/mingw-w64-sleef-git/PKGBUILD +++ b/windows/mingw-w64-sleef-git/PKGBUILD @@ -21,10 +21,8 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cmake" patch make) source=("git+https://github.com/shibatch/sleef" - 0001-Use-addSuffix-in-place-of-cat-type.patch 0002-Use-vector-calling-convention.patch) sha256sums=('SKIP' - '8992b4b0c01d8639c84c05ebb759cacb131298d3756df933b76bc6011a556249' '66813be9393f05c60ce2d87c5bcc8156ace4cfa753ed99abac3655a61af6a18d') pkgver() { @@ -39,7 +37,6 @@ prepare() { git reset --hard HEAD git clean -fdx - patch -Np1 < ../0001-Use-addSuffix-in-place-of-cat-type.patch patch -Np1 < ../0002-Use-vector-calling-convention.patch }