mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-09 14:35:25 +00:00
1012dc2933
We are so close to a release that we don't want to pull in a gnulib submodule update and risk regressions, since there has been a lot of other gnulib churn upstream. However, there are a couple of gnulib issues that are worth fixing in isolation, by applying local patches to gnulib. There was an upstream gnulib bug in maint.mk that rendered most of our syntax checks ineffective (and fixing it flushed out a minor bug in our code): https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00194.html There is still an upstream bug where gnulib uses the wrong type for ssize_t on mingw; we need the fix now even though it has not yet been accepted into gnulib: https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00188.html * gnulib/local/top/maint.mk.diff: Pick up upstream gnulib maint.mk. * gnulib/local/m4/ssize_t.m4.diff: Work around gnulib bug. * src/libvirt.c: Remove unused header. * cfg.mk (exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF): Exempt gnulib local files.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git i/top/maint.mk w/top/maint.mk
|
|
index 4cbd5f4..2228a37 100644
|
|
--- i/top/maint.mk
|
|
+++ w/top/maint.mk
|
|
@@ -279,7 +279,7 @@ define _sc_search_regexp
|
|
if test -n "$$files"; then \
|
|
if test -n "$$prohibit"; then \
|
|
grep $$with_grep_options $(_ignore_case) -nE "$$prohibit" $$files \
|
|
- | grep -vE "$${exclude-^$$}" \
|
|
+ | grep -vE "$${exclude:-^$$}" \
|
|
&& { msg="$$halt" $(_sc_say_and_exit) } || :; \
|
|
else \
|
|
grep $$with_grep_options $(_ignore_case) -LE "$$require" $$files \
|
|
@@ -455,7 +455,8 @@ sc_prohibit_quotearg_without_use:
|
|
|
|
# Don't include quote.h unless you use one of its functions.
|
|
sc_prohibit_quote_without_use:
|
|
- @h='quote.h' re='\<quote(_n)? *\(' $(_sc_header_without_use)
|
|
+ @h='quote.h' re='\<quote((_n)? *\(|_quoting_options\>)' \
|
|
+ $(_sc_header_without_use)
|
|
|
|
# Don't include this header unless you use one of its functions.
|
|
sc_prohibit_long_options_without_use:
|
|
@@ -1332,7 +1333,7 @@ alpha beta stable: $(local-check) writable-files $(submodule-checks)
|
|
$(MAKE) vc-diff-check
|
|
$(MAKE) news-check
|
|
$(MAKE) distcheck
|
|
- $(MAKE) dist XZ_OPT=-9ev
|
|
+ $(MAKE) dist
|
|
$(MAKE) $(release-prep-hook) RELEASE_TYPE=$@
|
|
$(MAKE) -s emit_upload_commands RELEASE_TYPE=$@
|
|
|