Fri Nov 26 19:39:15 2021 UTC ()
Honor LDFLAGS to fix NetBSD build. Ride recent import.


(schmonz)
diff -r1.1 -r1.2 pkgsrc/graphics/pikchr/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/pikchr/patches/patch-Makefile
cvs diff -r1.1 -r1.2 pkgsrc/graphics/pikchr/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/pikchr/distinfo 2021/11/26 09:38:52 1.1
+++ pkgsrc/graphics/pikchr/distinfo 2021/11/26 19:39:15 1.2
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.1 2021/11/26 09:38:52 schmonz Exp $ 1$NetBSD: distinfo,v 1.2 2021/11/26 19:39:15 schmonz Exp $
2 2
3BLAKE2s (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 00125e7b4de045b7454fa39b094e717f891de99e9ba35c2f6e97a9cb58dbd106 3BLAKE2s (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 00125e7b4de045b7454fa39b094e717f891de99e9ba35c2f6e97a9cb58dbd106
4SHA512 (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 2339ac1ce17b97698f32d022f92014ba01f279c7aa64e9f1ebbbc1808c58ed75fbb1f935cc8eccb883a7b627aa9de4eaac1ece1b444abc6f5769c2ff77c07d1f 4SHA512 (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 2339ac1ce17b97698f32d022f92014ba01f279c7aa64e9f1ebbbc1808c58ed75fbb1f935cc8eccb883a7b627aa9de4eaac1ece1b444abc6f5769c2ff77c07d1f
5Size (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 245370 bytes 5Size (pikchr-b79ce27929e9cc79/pikchr.tar.gz) = 245370 bytes
6SHA1 (patch-Makefile) = c538909958cd0e58a72833964e6aae5c6226e15c 6SHA1 (patch-Makefile) = e3900e12fd25b89ebf848820594977a9776cbb75
cvs diff -r1.1 -r1.2 pkgsrc/graphics/pikchr/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/pikchr/patches/patch-Makefile 2021/11/26 09:38:52 1.1
+++ pkgsrc/graphics/pikchr/patches/patch-Makefile 2021/11/26 19:39:15 1.2
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-Makefile,v 1.1 2021/11/26 09:38:52 schmonz Exp $ 1$NetBSD: patch-Makefile,v 1.2 2021/11/26 19:39:15 schmonz Exp $
2 2
3Honor pkgsrc-provided CFLAGS. 3Honor pkgsrc-provided CFLAGS and LDFLAGS.
4 4
5--- Makefile.orig 2021-11-04 18:36:41.000000000 +0000 5--- Makefile.orig 2021-11-04 18:36:41.000000000 +0000
6+++ Makefile 6+++ Makefile
7@@ -1,5 +1,5 @@ 7@@ -1,5 +1,5 @@
8 CC = gcc 8 CC = gcc
9-CFLAGS = -O0 -g -Wall -Wextra 9-CFLAGS = -O0 -g -Wall -Wextra
10+CFLAGS ?= -O0 -g -Wall -Wextra 10+CFLAGS ?= -O0 -g -Wall -Wextra
11 LIBS = -lm 11 LIBS = -lm
12  12
13 TCL_PACKAGE_NAME = pikchr 13 TCL_PACKAGE_NAME = pikchr
 14@@ -11,7 +11,7 @@ TCL_PACKAGE_FLAGS = \
 15 all: pikchr
 16
 17 pikchr: pikchr.c
 18- $(CC) $(CFLAGS) -DPIKCHR_SHELL pikchr.c -o pikchr $(LIBS)
 19+ $(CC) $(CFLAGS) -DPIKCHR_SHELL $(LDFLAGS) pikchr.c -o pikchr $(LIBS)
 20
 21 pikchrfuzz: pikchr.c
 22 clang -g -O3 -fsanitize=fuzzer,undefined,address -o pikchrfuzz \