From 25713c10decc45ad5507ae344ddda2e42b177450 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 4 Jan 2022 17:20:26 +0100 Subject: [PATCH] jsonnet: revert to gnu-makefile, cmake breaks cross. --- srcpkgs/jsonnet/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/jsonnet/template b/srcpkgs/jsonnet/template index 28456b031f7..6ba1e79da29 100644 --- a/srcpkgs/jsonnet/template +++ b/srcpkgs/jsonnet/template @@ -1,10 +1,9 @@ # Template file for 'jsonnet' pkgname=jsonnet version=0.18.0 -revision=2 -build_style=cmake -configure_args="-DUSE_SYSTEM_GTEST=ON" -makedepends="gtest-devel" +revision=3 +build_style=gnu-makefile +make_use_env=true short_desc="Data templating language" maintainer="Leah Neukirchen " license="Apache-2.0" @@ -12,17 +11,13 @@ homepage="https://github.com/google/jsonnet" distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz" checksum=85c240c4740f0c788c4d49f9c9c0942f5a2d1c2ae58b2c71068107bc80a3ced4 -post_install() { - # remove third-party stuff - rm -r ${DESTDIR}/usr/lib/cmake ${DESTDIR}/usr/include/c4 ${DESTDIR}/usr/lib/libc4* -} +CXXFLAGS="-fPIC" jsonnet-devel_package() { depends="${sourcepkg}-${version}_${revision}" short_desc="${short_desc} - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" } }