diff options
| author |   David Coles <coles.david@gmail.com> | 2019-05-02 17:30:33 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2019-05-02 17:31:42 -0700 |
| commit | 8e87ce69a8b39fb1f90732acb019d90f82687b2a (patch) | |
| tree | aeaa5cacf97b730e9df692f271f83a1a28239e1e /dev-lang/jsonnet/files | |
| parent | net-nntp/nzbget: remove old (diff) | |
| download | gentoo-8e87ce69a8b39fb1f90732acb019d90f82687b2a.tar.gz gentoo-8e87ce69a8b39fb1f90732acb019d90f82687b2a.tar.bz2 gentoo-8e87ce69a8b39fb1f90732acb019d90f82687b2a.zip | |
dev-lang/jsonnet: New package
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Signed-off-by: David Coles <coles.david@gmail.com>
Diffstat (limited to 'dev-lang/jsonnet/files')
| -rw-r--r-- | dev-lang/jsonnet/files/jsonnet-0.12.1-dont-call-make-from-setuppy.patch | 14 | ||||
| -rw-r--r-- | dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch | 28 |
2 files changed, 42 insertions, 0 deletions
diff --git a/dev-lang/jsonnet/files/jsonnet-0.12.1-dont-call-make-from-setuppy.patch b/dev-lang/jsonnet/files/jsonnet-0.12.1-dont-call-make-from-setuppy.patch new file mode 100644 index 000000000000..66bb5d2b07e7 --- /dev/null +++ b/dev-lang/jsonnet/files/jsonnet-0.12.1-dont-call-make-from-setuppy.patch @@ -0,0 +1,14 @@ +diff --git a/setup.py b/setup.py +index bfad34a..cfb30c3 100644 +--- a/setup.py ++++ b/setup.py +@@ -68,9 +68,6 @@ setup(name='jsonnet', + author='David Cunningham', + author_email='dcunnin@google.com', + version=get_version(), +- cmdclass={ +- 'build_ext': BuildJsonnetExt, +- }, + ext_modules=[jsonnet_ext], + test_suite="python._jsonnet_test", + ) diff --git a/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch b/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch new file mode 100644 index 000000000000..b52c899aa77c --- /dev/null +++ b/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch @@ -0,0 +1,28 @@ +diff --git a/Makefile b/Makefile +index c6d38e5..8dbaa9f 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,8 +29,8 @@ OD ?= od + + OPT ?= -O3 + +-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json +-CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude ++CXXFLAGS += -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json ++CFLAGS += -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude + MAKEDEPENDFLAGS ?= -Iinclude -Ithird_party/md5 -Ithird_party/json + EMCXXFLAGS = $(CXXFLAGS) -g0 -Os --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s OUTLINING_LIMIT=10000 -s RESERVED_FUNCTION_POINTERS=20 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 + EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0 -s ASSERTIONS=1 -s ALLOW_MEMORY_GROWTH=1 +@@ -123,10 +123,10 @@ jsonnet: cmd/jsonnet.cpp $(LIB_OBJ) + + # C binding. + libjsonnet.so: $(LIB_OBJ) +- $(CXX) $(LDFLAGS) $(LIB_OBJ) $(SHARED_LDFLAGS) -o $@ ++ $(CXX) $(LDFLAGS) $(LIB_OBJ) $(SHARED_LDFLAGS) -Wl,-soname,libjsonnet.so -o $@ + + libjsonnet++.so: $(LIB_CPP_OBJ) +- $(CXX) $(LDFLAGS) $(LIB_CPP_OBJ) $(SHARED_LDFLAGS) -o $@ ++ $(CXX) $(LDFLAGS) $(LIB_CPP_OBJ) $(SHARED_LDFLAGS) -Wl,-soname,libjsonnet++.so -o $@ + + # JavaScript build of C binding + JS_EXPORTED_FUNCTIONS = 'EXPORTED_FUNCTIONS=["_jsonnet_make", "_jsonnet_evaluate_snippet", "_jsonnet_fmt_snippet", "_jsonnet_ext_var", "_jsonnet_ext_code", "_jsonnet_tla_var", "_jsonnet_tla_code", "_jsonnet_realloc", "_jsonnet_destroy", "_jsonnet_import_callback"]' |