Release build fix

3 files changed, 3 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a7766a1d6aa..4a401b494ea8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,9 +10,7 @@ pkgbase = flatbuffers-git
 	makedepends = python-setuptools
 	depends = gcc-libs
 	source = git+https://github.com/google/flatbuffers
-	source = remove-nested-verifier-test.patch
 	sha256sums = SKIP
-	sha256sums = 62993fce5b8fe683fc5ea61c60376b385764afc28e95cfb2094494df184d61ba
 
 pkgname = flatbuffers-git
 	provides = flatbuffers=2.0.6.r118.g987aa5b5
diff --git a/PKGBUILD b/PKGBUILD
index 09dd7c8d641b..1270e226a57a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,11 +12,8 @@ url='https://google.github.io/flatbuffers/'
 license=(Apache)
 depends=(gcc-libs)
 makedepends=(cmake git python-setuptools)
-source=(git+https://github.com/google/flatbuffers remove-nested-verifier-test.patch)
-sha256sums=(
-    'SKIP'
-    '62993fce5b8fe683fc5ea61c60376b385764afc28e95cfb2094494df184d61ba'
-)
+source=(git+https://github.com/google/flatbuffers)
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${srcdir}/${_gitbase}
@@ -25,14 +22,12 @@ pkgver() {
 
 prepare() {
   sed -i 's/-Werror=/-W/g;s/-Werror//g' $_gitbase/CMakeLists.txt
-
-  # patch necessary for https://github.com/google/flatbuffers/issues/7336
-  patch -p1 --input="${srcdir}/remove-nested-verifier-test.patch" --directory="$_gitbase"
 }
 
 build() {
   cd $_gitbase
   cmake . \
+    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DFLATBUFFERS_BUILD_FLATLIB=OFF \
diff --git a/remove-nested-verifier-test.patch b/remove-nested-verifier-test.patch
deleted file mode 100644
index 28b323fcce98..000000000000
--- a/remove-nested-verifier-test.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test.cpp b/tests/test.cpp
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -4424,8 +4424,8 @@ int FlatBufferTests() {
-   FixedLengthArraySpanTest();
-   StructUnionTest();
-   WarningsAsErrorsTest();
--  NestedVerifierTest();
-+  // NestedVerifierTest();
-   PrivateAnnotationsLeaks();
-   return 0;
- }