pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
carburetta: Update to 0.8.20
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Wed Jan 17 18:02:29 2024 +0100
Changeset: 2334fb5860a7ef7e1b51db9ec0c510e08dcb9b1d
Modified Files:
carburetta/Makefile
carburetta/distinfo
carburetta/patches/patch-Makefile
Added Files:
carburetta/TODO
Log Message:
carburetta: Update to 0.8.20
0.8.20 - 2023-09-14
- For std::move generated code, don't rely on #include <type_traits> but
specifically #include <utility> (fixes compile failure on later
gcc compilers.)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2334fb5860a7ef7e1b51db9ec0c510e08dcb9b1d
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
carburetta/Makefile | 6 ++++--
carburetta/TODO | 1 +
carburetta/distinfo | 8 ++++----
carburetta/patches/patch-Makefile | 19 ++++++++++++-------
4 files changed, 21 insertions(+), 13 deletions(-)
diffs:
diff --git a/carburetta/Makefile b/carburetta/Makefile
index 8b2f91b996..9049c22ac7 100644
--- a/carburetta/Makefile
+++ b/carburetta/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= carburetta-v0.8.6
+DISTNAME= carburetta-v0.8.20
PKGNAME= ${DISTNAME:S/-v/-/}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=kingletbv/}
@@ -11,9 +11,11 @@ HOMEPAGE= https://carburetta.com/
COMMENT= Fused scanner parser generator
LICENSE= apache-2.0
+MAKE_JOBS_SAFE= no
+
USE_TOOLS= gmake
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
INSTALLATION_DIRS= bin
INSTALLATION_DIRS+= share/doc/carburetta
diff --git a/carburetta/TODO b/carburetta/TODO
new file mode 100644
index 0000000000..4e7ec7ddd5
--- /dev/null
+++ b/carburetta/TODO
@@ -0,0 +1 @@
+- Fix segfault while building on NetBSD
diff --git a/carburetta/distinfo b/carburetta/distinfo
index c0d0493f2f..8481997615 100644
--- a/carburetta/distinfo
+++ b/carburetta/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-BLAKE2s (carburetta-v0.8.6.tar.gz) = cde6d8d8381f53355692b40ddc9d6f79ca0119e8426fdc79cc446c717a8a19f5
-SHA512 (carburetta-v0.8.6.tar.gz) = 7d3191d00792201536a20120409019d73d3a209bf46f429490340d7092817450f388d2848f3304c57312e748dda737fb204d7ba73075a0da1c43bb0b6ccef1c4
-Size (carburetta-v0.8.6.tar.gz) = 184945 bytes
-SHA1 (patch-Makefile) = 1040284f70a944a041f312bacb34df9bf0719737
+BLAKE2s (carburetta-v0.8.20.tar.gz) = 49fffd09031c5c5d441188a7c82d784043cb6c91101b33955db2219879986aac
+SHA512 (carburetta-v0.8.20.tar.gz) = dc5b78b3c0050eadb1d731789f381b8795230965416f74f650c89f1a9a29b8a36fd5b9c8d9bfa4f65c56559afe08ebbe69b3b4ea46e38d14d0b16d95d7d6501d
+Size (carburetta-v0.8.20.tar.gz) = 264453 bytes
+SHA1 (patch-Makefile) = 70ee97ca145ef3cd42fc56165884539d91ae6e73
SHA1 (patch-src_temp__output.c) = 2534236b8c2537011646e8fa4342ddf88ee24ceb
diff --git a/carburetta/patches/patch-Makefile b/carburetta/patches/patch-Makefile
index 982d040560..107ff71805 100644
--- a/carburetta/patches/patch-Makefile
+++ b/carburetta/patches/patch-Makefile
@@ -4,10 +4,12 @@ Do not overwrite $CC from environment with specific compiler.
Honor CPPFLAGS, CFLAGS and LDFLAGS for build.
Honor DESTDIR and PREFIX for install.
---- Makefile.orig 2021-04-09 12:00:52.000000000 +0000
+--- Makefile.orig 2023-07-14 09:48:48.000000000 +0000
+++ Makefile
-@@ -1,8 +1,8 @@
+@@ -1,10 +1,8 @@
-CC=gcc
+-#CC=clang
+-CXXFLAGS=-Wall
+# Modified version for pkgsrc
-OUT = build/linux
@@ -18,7 +20,7 @@ Honor DESTDIR and PREFIX for install.
SOURCES = $(filter-out src/tokens_generated_scanners.c,$(wildcard $(SRC)/*.c))
OBJECTS = $(patsubst $(SRC)/%.c,$(INTERMEDIATE)/%.o,$(SOURCES))
-@@ -12,10 +12,10 @@ all: $(OUT)/carburetta $(OUT)/calc $(OUT
+@@ -19,10 +17,10 @@ all: $(OUT)/carburetta $(OUT)/calc $(OUT
$(INTERMEDIATE)/%.o: $(SRC)/%.c
@mkdir -p $(@D)
@@ -31,7 +33,7 @@ Honor DESTDIR and PREFIX for install.
$(INTERMEDIATE)/calc/calc.c: $(OUT)/carburetta examples/calc/calc.cbrt
mkdir -p $(@D)
-@@ -30,13 +30,13 @@ $(INTERMEDIATE)/template_scan/template_s
+@@ -37,13 +35,13 @@ $(INTERMEDIATE)/template_scan/template_s
$(OUT)/carburetta examples/template_scan/template_scan.cbrt --c $(INTERMEDIATE)/template_scan/template_scan.c
$(OUT)/calc: $(INTERMEDIATE)/calc/calc.c
@@ -46,9 +48,9 @@ Honor DESTDIR and PREFIX for install.
- $(CC) -o $(OUT)/template_scan $(INTERMEDIATE)/template_scan/template_scan.c
+ $(CC) $(CPPFLAGS) $(CFLAGS) -o $(OUT)/template_scan $(INTERMEDIATE)/template_scan/template_scan.c
- .PHONY: clean
- clean:
-@@ -44,8 +44,8 @@ clean:
+ .PRECIOUS: $(INTERMEDIATE)/tester/%.c
+ $(INTERMEDIATE)/tester/%.c: tester/%.cbrt
+@@ -71,11 +69,11 @@ clean:
.PHONY: install
install: all
@@ -59,3 +61,6 @@ Honor DESTDIR and PREFIX for install.
uninstall:
- rm /usr/local/bin/carburetta
+ rm $(DESTDIR)$(PREFIX)/bin/carburetta
+
+ .PHONY: test
+ test: all
Home |
Main Index |
Thread Index |
Old Index