diff options
| author | dholland <dholland@pkgsrc.org> | 2021-12-25 21:45:42 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2021-12-25 21:45:42 +0000 |
| commit | 89bb64189afb3b343f5665b8d0fed0dd264846f1 (patch) | |
| tree | 122036f513ced23e664dce5bdfaa462e1af94cd7 | |
| parent | e5139582f1b7bad61c7dab5ceb402b64a27cdff8 (diff) | |
| download | pkgsrc-89bb64189afb3b343f5665b8d0fed0dd264846f1.tar.gz | |
Fix broken build of lang/cparser; escaping hashes in gmake broke
| -rw-r--r-- | lang/cparser/distinfo | 4 | ||||
| -rw-r--r-- | lang/cparser/patches/patch-aa | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lang/cparser/distinfo b/lang/cparser/distinfo index 22144089395..165c85a9f00 100644 --- a/lang/cparser/distinfo +++ b/lang/cparser/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2021/10/26 10:51:32 nia Exp $ +$NetBSD: distinfo,v 1.10 2021/12/25 21:45:42 dholland Exp $ BLAKE2s (cparser-0.9.14.tar.bz2) = e60945b7527dfef5494cc174f790ae2ec068bc5796ff5a7f92b3b82150131868 SHA512 (cparser-0.9.14.tar.bz2) = 1bd436c9e2a36cb60341c62e9bb65e16dbc5f777918c3f43795c36321a5a8ce4cdf261469c2e45e329cd8560ccec44becffab2f924cd9d9bd9ff2d46d93ca4e9 Size (cparser-0.9.14.tar.bz2) = 193745 bytes -SHA1 (patch-aa) = 9f1f39561a6ffdaeb9dfc3d64934e8cdca501e3b +SHA1 (patch-aa) = 0a4aad62586804811f4feea5356d3da136ddf036 diff --git a/lang/cparser/patches/patch-aa b/lang/cparser/patches/patch-aa index 47073b8241d..7496653c8ef 100644 --- a/lang/cparser/patches/patch-aa +++ b/lang/cparser/patches/patch-aa @@ -1,7 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2015/12/29 23:34:45 dholland Exp $ +$NetBSD: patch-aa,v 1.6 2021/12/25 21:45:43 dholland Exp $ Configure for pkgsrc. Use libtool. +Fix escaping creating revision.h. --- Makefile.orig 2012-11-21 17:50:43.000000000 +0000 +++ Makefile @@ -33,7 +34,18 @@ Use libtool. Q = @ -@@ -113,7 +113,7 @@ UNUSED := $(shell mkdir -p $(DIRS) $(DIR +@@ -103,8 +103,9 @@ config.h: + REVISION ?= $(shell git describe --abbrev=40 --always --dirty --match '') + + # Update revision.h if necessary ++HASH=\# + UNUSED := $(shell \ +- REV="\#define cparser_REVISION \"$(REVISION)\""; \ ++ REV="${HASH}define cparser_REVISION \"$(REVISION)\""; \ + echo "$$REV" | cmp -s - revision.h 2> /dev/null || echo "$$REV" > revision.h \ + ) + +@@ -113,7 +114,7 @@ UNUSED := $(shell mkdir -p $(DIRS) $(DIR $(GOAL): $(LIBFIRM_FILE) $(cparser_OBJECTS) @echo "===> LD $@" @@ -42,7 +54,7 @@ Use libtool. ifneq ("$(LIBFIRM_FILE)", "") ifneq ("$(MAKECMDGOALS)", "clean") -@@ -144,33 +144,33 @@ bootstrap2: cparser.bootstrap2 +@@ -144,33 +145,33 @@ bootstrap2: cparser.bootstrap2 @echo '===> CPARSER $<' $(Q)./cparser $(CPPFLAGS) -fsyntax-only $< |