pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
sparse: update to 0.6.4.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Thu Apr 14 08:00:43 2022 +0200
Changeset: bf8442e402b22bdab48fe5a778dcf458bd3bbe8b
Modified Files:
sparse/Makefile
sparse/PLIST
sparse/distinfo
sparse/patches/patch-Makefile
Removed Files:
sparse/patches/patch-cgcc
sparse/patches/patch-dissect.h
sparse/patches/patch-lib.c
Log Message:
sparse: update to 0.6.4.
Lots of changes since the last packaged release.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf8442e402b22bdab48fe5a778dcf458bd3bbe8b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
sparse/Makefile | 16 ++++++++--------
sparse/PLIST | 26 ++++++--------------------
sparse/distinfo | 11 ++++-------
sparse/patches/patch-Makefile | 35 ++++++++++++-----------------------
sparse/patches/patch-cgcc | 23 -----------------------
sparse/patches/patch-dissect.h | 27 ---------------------------
sparse/patches/patch-lib.c | 31 -------------------------------
7 files changed, 30 insertions(+), 139 deletions(-)
diffs:
diff --git a/sparse/Makefile b/sparse/Makefile
index be8f7d4fc4..73402b8986 100644
--- a/sparse/Makefile
+++ b/sparse/Makefile
@@ -1,6 +1,6 @@
# $NetBSD$
-DISTNAME= sparse-0.5.0
+DISTNAME= sparse-0.6.4
CATEGORIES= devel
MASTER_SITES= https://www.kernel.org/pub/software/devel/sparse/dist/
@@ -11,16 +11,16 @@ LICENSE= mit
USE_TOOLS+= gmake pkg-config
-PKGCONFIG_OVERRIDE+= sparse.pc.in
+REPLACE_PERL+= cgcc
+USE_LANGUAGES= c c++
-SUBST_CLASSES= installflags
-SUBST_STAGE.installflags= post-patch
-SUBST_FILES.installflags= Makefile
-SUBST_SED.installflags= -e 's,install -v,install,g'
-SUBST_MESSAGE.conf= Remove verbose flag for install
+MAKE_FLAGS+= BINDIR=${PREFIX}/bin
+MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-#.include "../../lang/llvm/buildlink3.mk"
+.include "../../lang/llvm/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sparse/PLIST b/sparse/PLIST
index b989bb4f41..58811e4680 100644
--- a/sparse/PLIST
+++ b/sparse/PLIST
@@ -1,25 +1,11 @@
@comment $NetBSD$
bin/c2xml
bin/cgcc
+bin/semind
bin/sparse
+bin/sparse-llvm
+bin/sparsec
bin/test-inspect
-include/sparse/allocate.h
-include/sparse/bitmap.h
-include/sparse/compat.h
-include/sparse/dissect.h
-include/sparse/expression.h
-include/sparse/flow.h
-include/sparse/ident-list.h
-include/sparse/lib.h
-include/sparse/linearize.h
-include/sparse/parse.h
-include/sparse/ptrlist.h
-include/sparse/scope.h
-include/sparse/storage.h
-include/sparse/symbol.h
-include/sparse/target.h
-include/sparse/token.h
-lib/libsparse.a
-lib/pkgconfig/sparse.pc
-share/man/man1/cgcc.1
-share/man/man1/sparse.1
+man/man1/cgcc.1
+man/man1/semind.1
+man/man1/sparse.1
diff --git a/sparse/distinfo b/sparse/distinfo
index 41df17987b..0a6947aad5 100644
--- a/sparse/distinfo
+++ b/sparse/distinfo
@@ -1,10 +1,7 @@
$NetBSD$
-RMD160 (sparse-0.5.0.tar.gz) = 566823986ca01eb924b74b03496b772972d3314a
-SHA512 (sparse-0.5.0.tar.gz) = 6c21735a4c9548771d51a8f22256122ee6f17489e830efd9b94ba28f58ee07038db4a55b13114b9ff9a70dbed7a668cab26275761ee12ff9be62a272c6be4221
-Size (sparse-0.5.0.tar.gz) = 239809 bytes
-SHA1 (patch-Makefile) = 2f31f0b28bf64b6c24fff2cd786f420f853222fb
-SHA1 (patch-cgcc) = 8d2cf687563fcc623b15d327908fd1b6dd81b1ea
-SHA1 (patch-dissect.h) = 75f6216fdd1776621181e82ffd610138c1811a9b
-SHA1 (patch-lib.c) = 4531f9125af693d6d8b752c7ea1829ccb62f6bf1
+BLAKE2s (sparse-0.6.4.tar.gz) = 83424a6da44e63c389a53961db3de1da1a16a94fccbde2201095de976e2b07f9
+SHA512 (sparse-0.6.4.tar.gz) = 3e301f50643c7a01eaf8823c159ab4f33a2724c2ca0516113e19e4a3242b82d3cad84b5a52f5d58f56d11c5f6468230a76dafc240e2386c4aa75ea96a8323edb
+Size (sparse-0.6.4.tar.gz) = 478893 bytes
+SHA1 (patch-Makefile) = 4b6ca037b59126a2b33d10a4fbadf96018c052f3
SHA1 (patch-pre-process.c) = a30be7c701ac8933f93a4021593dcdb61ed5ec0c
diff --git a/sparse/patches/patch-Makefile b/sparse/patches/patch-Makefile
index e124856818..1847c5e8f1 100644
--- a/sparse/patches/patch-Makefile
+++ b/sparse/patches/patch-Makefile
@@ -1,30 +1,19 @@
$NetBSD$
-Allow ovrride of PREFIX
+Fix installation - "-D" is not portable.
---- Makefile.orig 2014-02-16 22:44:57.000000000 +0000
+--- Makefile.orig 2021-09-06 03:51:46.000000000 +0000
+++ Makefile
-@@ -42,7 +42,7 @@ BASIC_CFLAGS += -Wp,-MD,$(@D)/.$(@F).d
- endif
+@@ -300,10 +300,10 @@ install-man: $(INST_MAN1:%=$(man1dir)/%)
- DESTDIR=
--PREFIX=$(HOME)
-+PREFIX?=$(HOME)
- BINDIR=$(PREFIX)/bin
- LIBDIR=$(PREFIX)/lib
- MANDIR=$(PREFIX)/share/man
-@@ -128,12 +128,12 @@ QUIET_INST_SH = $(Q:@=echo -n ' INS
- QUIET_INST = $(Q:@=@echo -n ' INSTALL ';)
+ $(bindir)/%: %
+ @echo " INSTALL $@"
+- $(Q)install -D $< $@ || exit 1;
++ $(Q)${BSD_INSTALL_PROGRAM} $< $@ || exit 1;
+ $(man1dir)/%: %
+ @echo " INSTALL $@"
+- $(Q)install -D -m 644 $< $@ || exit 1;
++ $(Q)${BSD_INSTALL_MAN} $< $@ || exit 1;
- define INSTALL_EXEC
-- $(QUIET_INST)install -v $1 $(DESTDIR)$2/$1 || exit 1;
-+ $(QUIET_INST)install $1 $(DESTDIR)$2/$1 || exit 1;
-
- endef
-
- define INSTALL_FILE
-- $(QUIET_INST)install -v -m 644 $1 $(DESTDIR)$2/$1 || exit 1;
-+ $(QUIET_INST)install -m 644 $1 $(DESTDIR)$2/$1 || exit 1;
-
- endef
+ .PHONY: FORCE
diff --git a/sparse/patches/patch-cgcc b/sparse/patches/patch-cgcc
deleted file mode 100644
index 50c0fb1012..0000000000
--- a/sparse/patches/patch-cgcc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
-don't hard code perl
-don't die on netbsd unknown spec
-
---- cgcc.orig 2014-02-16 22:44:57.000000000 +0000
-+++ cgcc
-@@ -1,4 +1,5 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/env perl
-+use warnings;
- # -----------------------------------------------------------------------------
-
- my $cc = $ENV{'REAL_CC'} || 'cc';
-@@ -221,7 +222,7 @@ sub add_specs {
- } elsif ($spec eq 'linux') {
- return &add_specs ('unix') .
- ' -D__linux__=1 -D__linux=1 -Dlinux=linux';
-- } elsif ($spec eq 'openbsd') {
-+ } elsif (($spec eq 'openbsd') || ($spec eq 'netbsd')) {
- return &add_specs ('unix') .
- ' -D__OpenBSD__=1';
- } elsif ($spec eq 'unix') {
diff --git a/sparse/patches/patch-dissect.h b/sparse/patches/patch-dissect.h
deleted file mode 100644
index ff9e743515..0000000000
--- a/sparse/patches/patch-dissect.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
---- dissect.h.orig 2014-02-16 22:44:57.000000000 +0000
-+++ dissect.h
-@@ -27,13 +27,16 @@ struct reporter
- extern void dissect(struct symbol_list *, struct reporter *);
-
- #define MK_IDENT(s) ({ \
-- static struct { \
-+ static union { \
- struct ident ident; \
-- char __[sizeof(s)]; \
-- } ident = {{ \
-- .len = sizeof(s)-1, \
-- .name = s, \
-- }}; \
-+ struct { \
-+ char id[sizeof(struct ident)]; \
-+ char name[sizeof(s)]; \
-+ } named; \
-+ } ident = { \
-+ .ident.len = sizeof(s)-1, \
-+ .named.name = s, \
-+ }; \
- &ident.ident; \
- })
-
diff --git a/sparse/patches/patch-lib.c b/sparse/patches/patch-lib.c
deleted file mode 100644
index 282a0a34ba..0000000000
--- a/sparse/patches/patch-lib.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-Tolerate more warnings and errors, because there are a lot
-of nonsense warnings which are a pain to clean up (GCC
-visibility garbage).
-
---- lib.c.orig 2014-02-16 22:44:57.000000000 +0000
-+++ lib.c
-@@ -112,7 +112,7 @@ static void do_warn(const char *type, st
- name, pos.line, pos.pos, type, buffer);
- }
-
--static int max_warnings = 100;
-+static int max_warnings = 5000;
- static int show_info = 1;
-
- void info(struct position pos, const char * fmt, ...)
-@@ -148,11 +148,11 @@ void warning(struct position pos, const
- static void do_error(struct position pos, const char * fmt, va_list args)
- {
- static int errors = 0;
-- die_if_error = 1;
-+ die_if_error = 0;
- show_info = 1;
- /* Shut up warnings after an error */
- max_warnings = 0;
-- if (errors > 100) {
-+ if (errors > 5000) {
- static int once = 0;
- show_info = 0;
- if (once)
Home |
Main Index |
Thread Index |
Old Index