commit: 11c703a85fd6c811591e46f4a1ccade9ac403c08 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Dec 6 11:05:43 2019 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Fri Dec 6 15:38:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c703a8
dev-lang/jsonnet: remove unused patches Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/13890 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> .../jsonnet/files/jsonnet-0.12.1-makefile.patch | 28 ---------------------- .../jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch | 8 ------- 2 files changed, 36 deletions(-) diff --git a/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch b/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch deleted file mode 100644 index b52c899aa77..00000000000 --- a/dev-lang/jsonnet/files/jsonnet-0.12.1-makefile.patch +++ /dev/null @@ -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"]' diff --git a/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch b/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch deleted file mode 100644 index f63a246fd88..00000000000 --- a/dev-lang/jsonnet/files/jsonnet-0.13.0-glibc-2.29.patch +++ /dev/null @@ -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 )
