testing/jsonnet: upgrade to 0.15.0

4 files changed, 17 insertions, 95 deletions

diff --git a/testing/jsonnet/APKBUILD b/testing/jsonnet/APKBUILD
index a3269c1777..b491c541fc 100644
--- a/testing/jsonnet/APKBUILD
+++ b/testing/jsonnet/APKBUILD
@@ -1,45 +1,40 @@
 # Contributor: TBK <alpine@jjtc.eu>
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname="jsonnet"
-pkgver="0.13.0"
-pkgrel=1
+pkgver="0.15.0"
+pkgrel=0
 pkgdesc="The data templating language"
 url="https://jsonnet.org/"
 arch="all"
 license="Apache-2.0"
 makedepends="cmake"
-checkdepends="gtest-dev"
+checkdepends="bash gtest-dev"
 subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/google/jsonnet/archive/v$pkgver.tar.gz
-	build-cli-shared.patch
-	use-real-sys-gtest.patch
-	fix-soname-ver.patch
-	"
+source="$pkgname-$pkgver.tar.gz::https://github.com/google/jsonnet/archive/v$pkgver.tar.gz"
 
 build() {
-	mkdir build && cd build
-	cmake .. \
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_CLI_SHARED=ON \
-		-DUSE_SYSTEM_GTEST=ON
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_STATIC_LIBS=OFF \
+		-DBUILD_SHARED_BINARIES=ON \
+		-DUSE_SYSTEM_GTEST=ON \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS} .
 	make
 }
 
 check() {
-	cd "$builddir"/build
-	ctest
+	make test
 }
 
 package() {
-	cd "$builddir"/build
 	make DESTDIR="$pkgdir" install
-
-	# Remove static lib
-	rm "$pkgdir"/usr/lib/libjsonnet.a
 }
 
-sha512sums="d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5  jsonnet-0.13.0.tar.gz
-6fe49c3d9a720096b443a7875ce4b96281871b0070b6243599e5ed4bf64638f8fd118e35d2a3a19c11bb68b3b475c29f1e4ca84f755ec329d5602d783ca39e41  build-cli-shared.patch
-948f89109a4d8d658cfffed8058557b133ef9d62c62854ba13d2dccccd532f0625a4ebe72ed5f748c72da518c0abb44df2add0d49e1dcdf6a105e112ff96b326  use-real-sys-gtest.patch
-4ab891d05bf2ab1bdbc3cfda4bdb6d8ea79c85b6866f847211733dfe6b00b19c8056e01ebd397c6669c3fc3c116e9202df0bb940bcba5a07b09bfbcac10746a3  fix-soname-ver.patch"
+sha512sums="b63c1bf82e4fc9ba3f1009ed4e4ba1010e3e7f81bd816a234e48d35607eae3cba95cab57813d35daa9f024e316bae5256340a6f8d6d884f9136cdbf062a2b351  jsonnet-0.15.0.tar.gz"
diff --git a/testing/jsonnet/build-cli-shared.patch b/testing/jsonnet/build-cli-shared.patch
deleted file mode 100644
index f10d79edbf..0000000000
--- a/testing/jsonnet/build-cli-shared.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,6 +6,7 @@
- # User-configurable options.
- option(BUILD_JSONNET "Build jsonnet command-line tool." ON)
- option(BUILD_JSONNETFMT "Build jsonnetfmt command-line tool." ON)
-+option(BUILD_CLI_SHARED "Build command-line tools against shared lib" OFF)
- option(BUILD_TESTS "Build and run jsonnet tests." ON)
- option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF)
- set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING
-
---- a/cmd/CMakeLists.txt
-+++ b/cmd/CMakeLists.txt
-@@ -2,16 +2,28 @@
- 
- if (BUILD_JSONNET OR BUILD_TESTS)
-     add_executable(jsonnet ${LIBJSONNET_SOURCE} jsonnet.cpp utils.cpp)
--    add_dependencies(jsonnet libjsonnet_static)
--    target_link_libraries(jsonnet libjsonnet_static)
- 
-+    if (BUILD_CLI_SHARED)
-+        add_dependencies(jsonnet libjsonnet)
-+        target_link_libraries(jsonnet libjsonnet)
-+    else()
-+        add_dependencies(jsonnet libjsonnet_static)
-+        target_link_libraries(jsonnet libjsonnet_static)
-+    endif()
-+
- 	install(TARGETS jsonnet DESTINATION "${CMAKE_INSTALL_BINDIR}")
- endif()
- 
- if (BUILD_JSONNETFMT OR BUILD_TESTS)
-     add_executable(jsonnetfmt ${LIBJSONNET_SOURCE} jsonnetfmt.cpp utils.cpp)
--    add_dependencies(jsonnetfmt libjsonnet_static)
--    target_link_libraries(jsonnetfmt libjsonnet_static)
-+
-+    if (BUILD_CLI_SHARED)
-+        add_dependencies(jsonnetfmt libjsonnet)
-+        target_link_libraries(jsonnetfmt libjsonnet)
-+    else()
-+        add_dependencies(jsonnetfmt libjsonnet_static)
-+        target_link_libraries(jsonnetfmt libjsonnet_static)
-+    endif()
- 
- 	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")
- endif()
diff --git a/testing/jsonnet/fix-soname-ver.patch b/testing/jsonnet/fix-soname-ver.patch
deleted file mode 100644
index 61a733863f..0000000000
--- a/testing/jsonnet/fix-soname-ver.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Pulled from master. Can be deleted 0.13.0+
-
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -35,7 +35,7 @@
- # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
- # this step the output would be |liblibjsonnet|.
- set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet
--	VERSION     "0.12.1"
-+	VERSION     "0.13.0"
- 	SOVERSION   "0"
- 	PUBLIC_HEADER "${LIB_HEADER}")
- install(TARGETS libjsonnet
diff --git a/testing/jsonnet/use-real-sys-gtest.patch b/testing/jsonnet/use-real-sys-gtest.patch
deleted file mode 100644
index d4c00573e0..0000000000
--- a/testing/jsonnet/use-real-sys-gtest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,8 +72,9 @@
-     include_directories("${gtest_SOURCE_DIR}/include")
- 
- elseif (BUILD_TESTS AND USE_SYSTEM_GTEST)
--	enable_testing()
--	add_subdirectory(/usr/src/googletest ${GLOBAL_OUTPUT_PATH}/googletest-build)
-+    enable_testing()
-+    find_package(GTest REQUIRED)
-+    include_directories(${GTEST_INCLUDE_DIR})
- endif()
- 
- # Compiler flags.