jsonnet: update to 0.15.0.

This commit is contained in:
Leah Neukirchen 2020-02-10 10:35:55 +01:00
parent ec846b7d0c
commit 18bce5088b
2 changed files with 3 additions and 60 deletions

View file

@ -1,57 +0,0 @@
Remove javascript file install, and also removes
the need of the EM++ EMCC compiler, not in the repo.
Also add DESTDIR to fix packaging install.
DESTDIR fixes submitted upstream:
PR: https://github.com/google/jsonnet/pull/740
---
diff --git Makefile Makefile
index 474655c..c533125 100644
--- Makefile
+++ Makefile
@@ -82,10 +82,6 @@ LIBS = \
libjsonnet++.so.$(VERSION) \
ALL = \
- libjsonnet_test_snippet \
- libjsonnet_test_file \
- libjsonnet.js \
- doc/js/libjsonnet.js \
$(BINS) \
$(LIBS) \
$(LIB_OBJ)
@@ -187,12 +183,6 @@ JS_EXPORTED_FUNCTIONS = 'EXPORTED_FUNCTIONS=["_jsonnet_make", "_jsonnet_evaluate
JS_RUNTIME_METHODS = 'EXTRA_EXPORTED_RUNTIME_METHODS=["cwrap", "_free", "getValue", "lengthBytesUTF8", "_malloc", "UTF8ToString", "setValue", "stringToUTF8", "addFunction"]'
-libjsonnet.js: $(LIB_SRC) $(ALL_HEADERS)
- $(EMCXX) -s WASM=0 -s $(JS_EXPORTED_FUNCTIONS) -s $(JS_RUNTIME_METHODS) $(EMCXXFLAGS) $(LDFLAGS) $(LIB_SRC) -o $@
-
-# Copy javascript build to doc directory
-doc/js/libjsonnet.js: libjsonnet.js
- $(CP) $^ $@
# Tests for C binding.
LIBJSONNET_TEST_SNIPPET_SRCS = \
diff --git Makefile Makefile
index c533125..56fb1e4 100644
--- Makefile
+++ Makefile
@@ -122,12 +122,12 @@ endif
default: jsonnet jsonnetfmt
install: bins libs
- mkdir -p $(PREFIX)/bin
- cp $(BINS) $(PREFIX)/bin/
- mkdir -p $(PREFIX)/lib
- cp $(LIBS) $(PREFIX)/lib/
- mkdir -p $(PREFIX)/include
- cp $(INCS) $(PREFIX)/include/
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ cp -P $(BINS) $(DESTDIR)$(PREFIX)/bin/
+ mkdir -p $(DESTDIR)$(PREFIX)/lib
+ cp -P $(LIBS) $(DESTDIR)$(PREFIX)/lib/
+ mkdir -p $(DESTDIR)$(PREFIX)/include
+ cp -P $(INCS) $(DESTDIR)$(PREFIX)/include/
all: $(ALL)

View file

@ -1,14 +1,14 @@
# Template file for 'jsonnet'
pkgname=jsonnet
version=0.14.0
revision=3
version=0.15.0
revision=1
build_style=gnu-makefile
short_desc="Data templating language"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
homepage="https://github.com/google/jsonnet"
distfiles="https://github.com/google/jsonnet/archive/v${version}.tar.gz"
checksum=7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b
checksum=0b58f2a36a5625c717e717a7e85608730e7bb5bfd8be1765dd6fa23be1f9b9e8
CXXFLAGS="-fPIC"