summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--Don_t-treat-warnings-as-errors.patch12
-rw-r--r--PKGBUILD14
3 files changed, 5 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 65d41c70506b..7dde6d8eaf94 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wpimath-git
pkgdesc = WPILib's mathematics and controls library
- pkgver = 2024.1.1.beta.1.r29.gabb2857e03
+ pkgver = 2024.1.1.beta.4.r20.gd1793f077d
pkgrel = 1
url = https://github.com/wpilibsuite/allwpilib
arch = x86_64
@@ -15,8 +15,6 @@ pkgbase = wpimath-git
options = !strip
options = staticlibs
source = git+https://github.com/wpilibsuite/allwpilib
- source = Don_t-treat-warnings-as-errors.patch
md5sums = SKIP
- md5sums = 06355c12d930efa26edbbe11f633831a
pkgname = wpimath-git
diff --git a/Don_t-treat-warnings-as-errors.patch b/Don_t-treat-warnings-as-errors.patch
deleted file mode 100644
index 9d65f0a649f5..000000000000
--- a/Don_t-treat-warnings-as-errors.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/modules/CompileWarnings.cmake b/cmake/modules/CompileWarnings.cmake
-index 93b35b8abf..bf00ad1d3a 100644
---- a/cmake/modules/CompileWarnings.cmake
-+++ b/cmake/modules/CompileWarnings.cmake
-@@ -1,6 +1,6 @@
- macro(wpilib_target_warnings target)
- if(NOT MSVC)
-- target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Werror -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS})
-+ target_compile_options(${target} PRIVATE -Wall -pedantic -Wextra -Wno-unused-parameter ${WPILIB_TARGET_WARNINGS})
- else()
- target_compile_options(${target} PRIVATE /wd4146 /wd4244 /wd4251 /wd4267 /WX /D_CRT_SECURE_NO_WARNINGS ${WPILIB_TARGET_WARNINGS})
- endif()
diff --git a/PKGBUILD b/PKGBUILD
index 717e6e86cbfb..3b06cd53ef03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Tyler Veness <calcmogul at gmail dot com>
pkgname=wpimath-git
-pkgver=2024.1.1.beta.1.r29.gabb2857e03
+pkgver=2024.1.1.beta.4.r20.gd1793f077d
pkgrel=1
pkgdesc="WPILib's mathematics and controls library"
arch=('x86_64')
@@ -12,10 +12,8 @@ provides=('wpimath')
conflicts=('wpimath')
license=('BSD' 'MIT')
options=('!strip' 'staticlibs')
-source=('git+https://github.com/wpilibsuite/allwpilib'
- 'Don_t-treat-warnings-as-errors.patch')
-md5sums=('SKIP'
- '06355c12d930efa26edbbe11f633831a')
+source=('git+https://github.com/wpilibsuite/allwpilib')
+md5sums=('SKIP')
pkgver() {
cd allwpilib
@@ -25,11 +23,6 @@ pkgver() {
)
}
-prepare() {
- cd allwpilib
- patch -p1 < "$srcdir"/Don_t-treat-warnings-as-errors.patch
-}
-
build() {
cmake -B build -S "allwpilib" \
-DCMAKE_INSTALL_PREFIX='/usr' \
@@ -43,6 +36,7 @@ build() {
-DWITH_TESTS=ON \
-DWITH_GUI=OFF \
-DWITH_SIMULATION_MODULES=OFF \
+ -DNO_WERROR=ON \
-Wno-dev
cmake --build build
}