mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-lang/jsonnet: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13890 Signed-off-by: Aaron Bauman <bman@gentoo.org>
This commit is contained in:
committed by
Aaron Bauman
parent
b93b46f861
commit
11c703a85f
@@ -1,28 +0,0 @@
|
||||
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"]'
|
||||
@@ -1,8 +0,0 @@
|
||||
diff --git a/test_suite/error.import_folder.jsonnet.golden_regex b/test_suite/error.import_folder.jsonnet.golden_regex
|
||||
index bc468fb..c472b23 100644
|
||||
--- a/test_suite/error.import_folder.jsonnet.golden_regex
|
||||
+++ b/test_suite/error.import_folder.jsonnet.golden_regex
|
||||
@@ -1,2 +1,2 @@
|
||||
-(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error)?
|
||||
+(STATIC ERROR: lib:1:1: unexpected end of file.|RUNTIME ERROR: couldn't open import "lib": basic_filebuf::underflow error reading the file(: iostream error|: Is a directory)?
|
||||
error.import_folder.jsonnet:17:1-13 )
|
||||
Reference in New Issue
Block a user