From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- dev-lang/jsonnet/Manifest | 5 ++ ...sonnet-0.12.1-dont-call-make-from-setuppy.patch | 14 ++++++ .../jsonnet/files/jsonnet-0.12.1-makefile.patch | 28 +++++++++++ dev-lang/jsonnet/jsonnet-0.12.1.ebuild | 55 ++++++++++++++++++++++ dev-lang/jsonnet/metadata.xml | 15 ++++++ 5 files changed, 117 insertions(+) create mode 100644 dev-lang/jsonnet/Manifest create mode 100644 dev-lang/jsonnet/files/jsonnet-0.12.1-dont-call-make-from-setuppy.patch create mode 100644 dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch create mode 100644 dev-lang/jsonnet/jsonnet-0.12.1.ebuild create mode 100644 dev-lang/jsonnet/metadata.xml (limited to 'dev-lang/jsonnet') diff --git a/dev-lang/jsonnet/Manifest b/dev-lang/jsonnet/Manifest new file mode 100644 index 000000000000..1d75a9176c7c --- /dev/null +++ b/dev-lang/jsonnet/Manifest @@ -0,0 +1,5 @@ +AUX jsonnet-0.12.1-dont-call-make-from-setuppy.patch 387 BLAKE2B 8c0223b10cf1b61707b10361cfb96a01f492d234b3318554628dfc51a49728022db2f6573cf78d66a38cae0f59e2054e985e189268254563c0bf9e6854b3c129 SHA512 287a17a6b3aaf8c9a971874ff2a507c8d301caf84d243bd1d063d58e21e93bbecc2b417767e0d56d87f300cef9811f7aec0caa8616292950b11eb3103f7bebbb +AUX jsonnet-0.12.1-makefile.patch 1609 BLAKE2B a896703a118b194ed97a3c487e8e8a3d6ae1ae0f3989183cac0540b4ad09aeb5a4f2508b8a6f455f7eb077e4378cedaee5538e22f05a07844ea998f39825d93b SHA512 4f92e11f42ed90dcac5e55f12e50e6ffba305d3d691da79282d72059f18223aabb38d9f1420ce586de5e16e735b85174fb49b2ee48739864c47c292690030127 +DIST jsonnet-0.12.1.tar.gz 21839349 BLAKE2B 8601a35263003723b435d0075fe60f5301a49bddf63cdd55958df3eb7474569c28dbf54e0ba9d07fb6ade395af725193d1432b2c43fb2b271531af179e850df4 SHA512 25523dd19b4209a5ca39275ab3d3726b934442dd83a965ab0b79f0c67bd8ae85c438b2a63990b8eec921b137f908f946696be331b08cef92f15b6b8fa548cb0d +EBUILD jsonnet-0.12.1.ebuild 1183 BLAKE2B 3045b49d0a2ad935379094183a81f7816702013d9a1ba58075d8a1a446db86812a96c5ecc64f125cb034c3903fb0950af85f8414782d8f004212420ad791b5da SHA512 7808e39dff7f80eedfdfb780ce334a026b69b662e8b994009c65a07870fd5822b4842ecfa3e1f10dc8c6ba3f7ad4d8c33679800902951e1d54c3e92f7aa55881 +MISC metadata.xml 453 BLAKE2B 826e11d7714e4630a4d23ba46313ef7412af5815b39b60db8c4161d71ded81e023d8c605c1cc86ef0622dd3e2d97ca6b276ae1ba146458cfd20d5c4a80caf3bc SHA512 d621bb14cfd5106fb4e5f88d20dc84aab11c078348b4b605a0a3019b8fa09b55e011062a47fac55e3c8e5383770ca696807b4c97c1ae372b8b909c4bf25af024 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"]' diff --git a/dev-lang/jsonnet/jsonnet-0.12.1.ebuild b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild new file mode 100644 index 000000000000..e021db68f24d --- /dev/null +++ b/dev-lang/jsonnet/jsonnet-0.12.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +PYTHON_COMPAT=( python3_6 python3_7 ) + +inherit toolchain-funcs distutils-r1 + +DESCRIPTION="A data templating language for app and tool developers " +HOMEPAGE="http://jsonnet.org/" +SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz" +IUSE="python" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +DEPEND="python? ( ${PYTHON_DEPS} )" +RDEPEND="python? ( ${PYTHON_DEPS} )" +BDEPEND="python? ( ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}] + )" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/jsonnet-0.12.1-makefile.patch" + "${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch" +) + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ + jsonnet \ + libjsonnet.so \ + libjsonnet++.so + + use python && distutils-r1_src_compile +} + +src_test() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" test + use python && distutils-r1_src_test +} + +python_test() { + esetup.py test || die +} + +src_install() { + dolib.so libjsonnet*.so + dobin jsonnet + + use python && distutils-r1_src_install +} diff --git a/dev-lang/jsonnet/metadata.xml b/dev-lang/jsonnet/metadata.xml new file mode 100644 index 000000000000..9c2644baf918 --- /dev/null +++ b/dev-lang/jsonnet/metadata.xml @@ -0,0 +1,15 @@ + + + + + coles.david@gmail.com + David Coles + + + chutzpah@gentoo.org + Patrick McLean + + + google/jsonnet + + -- cgit v1.2.3