Thu Dec 15 14:45:57 2022 UTC ()
jsonnet: Fix od(1) args.


(jperkin)
diff -r1.7 -r1.8 pkgsrc/devel/jsonnet/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/jsonnet/patches/patch-Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/jsonnet/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/jsonnet/distinfo 2021/10/26 10:15:08 1.7
+++ pkgsrc/devel/jsonnet/distinfo 2022/12/15 14:45:57 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 10:15:08 nia Exp $ 1$NetBSD: distinfo,v 1.8 2022/12/15 14:45:57 jperkin Exp $
2 2
3BLAKE2s (jsonnet-0.13.0.tar.gz) = 17da79d139fce1d09a381e7a80ddb7a00ce812b01466ddeadeff074ce21c896c 3BLAKE2s (jsonnet-0.13.0.tar.gz) = 17da79d139fce1d09a381e7a80ddb7a00ce812b01466ddeadeff074ce21c896c
4SHA512 (jsonnet-0.13.0.tar.gz) = d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5 4SHA512 (jsonnet-0.13.0.tar.gz) = d19e5398763e37b79b0ef02368f6bd6215d2df234b5ff7a6d98e2306a0d47290600061c9f868c0c262570b4f0ee9eee6c309bcc93937b12f6c14f8d12339a7d5
5Size (jsonnet-0.13.0.tar.gz) = 21850449 bytes 5Size (jsonnet-0.13.0.tar.gz) = 21850449 bytes
6SHA1 (patch-Makefile) = fc6dc54470c56b9ce4ccc6658b5ed70693a42967 6SHA1 (patch-Makefile) = 4280734174a73045d12466fa4ebd58be594d6049
7SHA1 (patch-test__suite_tests.source) = 14fc92f664269ab4012c7f90b337276de77110f5 7SHA1 (patch-test__suite_tests.source) = 14fc92f664269ab4012c7f90b337276de77110f5
cvs diff -r1.3 -r1.4 pkgsrc/devel/jsonnet/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/jsonnet/patches/patch-Makefile 2019/08/13 18:04:28 1.3
+++ pkgsrc/devel/jsonnet/patches/patch-Makefile 2022/12/15 14:45:57 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.3 2019/08/13 18:04:28 seb Exp $ 1$NetBSD: patch-Makefile,v 1.4 2022/12/15 14:45:57 jperkin Exp $
2 2
3- leverage pkgsrc CPPFLAGS, CFLAGS and CXXFLAGS handling 3- leverage pkgsrc CPPFLAGS, CFLAGS and CXXFLAGS handling
4- take care of 'od -t u1' output variations 4- take care of 'od -t u1' output variations
5- do not build the JavaScript implementation 5- do not build the JavaScript implementation
6 6
7--- Makefile.orig 2019-06-03 17:28:46.000000000 +0000 7--- Makefile.orig 2019-06-03 17:28:46.000000000 +0000
8+++ Makefile 8+++ Makefile
9@@ -29,8 +29,9 @@ OD ?= od 9@@ -29,8 +29,9 @@ OD ?= od
10  10
11 OPT ?= -O3 11 OPT ?= -O3
12  12
13-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json 13-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5 -Ithird_party/json
14-CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude 14-CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude
@@ -61,20 +61,21 @@ $NetBSD: patch-Makefile,v 1.3 2019/08/13 @@ -61,20 +61,21 @@ $NetBSD: patch-Makefile,v 1.3 2019/08/13
61+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@ 61+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
62  62
63 LIBJSONNET_TEST_FILE_SRCS = \ 63 LIBJSONNET_TEST_FILE_SRCS = \
64 core/libjsonnet_test_file.c \ 64 core/libjsonnet_test_file.c \
65@@ -162,13 +161,13 @@ LIBJSONNET_TEST_FILE_SRCS = \ 65@@ -162,13 +161,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
66 include/libjsonnet.h 66 include/libjsonnet.h
67  67
68 libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS) 68 libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS)
69- $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@ 69- $(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
70+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@ 70+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
71  71
72 # Encode standard library for embedding in C 72 # Encode standard library for embedding in C
73 core/%.jsonnet.h: stdlib/%.jsonnet 73 core/%.jsonnet.h: stdlib/%.jsonnet
74 (($(OD) -v -Anone -t u1 $< \ 74- (($(OD) -v -Anone -t u1 $< \
 75+ (($(OD) -v -An -t u1 $< \
75 | tr " " "\n" \ 76 | tr " " "\n" \
76- | grep -v "^$$" \ 77- | grep -v "^$$" \
77+ | sed -e 's/^0//;/^$$/d' \ 78+ | sed -e 's/^0//;/^$$/d' \
78 | tr "\n" "," ) && echo "0") > $@ 79 | tr "\n" "," ) && echo "0") > $@
79 echo >> $@ 80 echo >> $@
80  81