QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update m4/ax_add_fortify_source.m4 and m4/ax_valgrind_check.m4

Browse Source
This commit is contained in:
Frank Denis
2025-07-30 12:34:28 +02:00
parent 604d0e17bd
commit 27efc25c2e
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
m4/ax_add_fortify_source.m4
+2 -4
View File
@@ -36,7 +36,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 8 #serial 10
AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[ AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
ac_save_cflags=$CFLAGS ac_save_cflags=$CFLAGS
@@ -58,7 +58,7 @@ AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
AC_LANG_SOURCE([[ AC_LANG_SOURCE([[
#define _FORTIFY_SOURCE 3 #define _FORTIFY_SOURCE 3
#include <string.h> #include <string.h>
int main() { int main(void) {
char *s = " "; char *s = " ";
strcpy(s, "x"); strcpy(s, "x");
return strlen(s)-1; return strlen(s)-1;
@@ -71,13 +71,11 @@ AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3" CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=3"
], [ ], [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
CFLAGS=$ac_save_cflags
ax_add_fortify_3_failed=1 ax_add_fortify_3_failed=1
], ],
), ),
[ [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
CFLAGS=$ac_save_cflags
ax_add_fortify_3_failed=1 ax_add_fortify_3_failed=1
]) ])
if test -n "$ax_add_fortify_3_failed" if test -n "$ax_add_fortify_3_failed"
m4/ax_valgrind_check.m4
+23 -25
View File
@@ -36,21 +36,19 @@
# AX_VALGRIND_DFLT([sgcheck], [off]) # AX_VALGRIND_DFLT([sgcheck], [off])
# AX_VALGRIND_CHECK # AX_VALGRIND_CHECK
# #
# Makefile.am: # in each Makefile.am with tests:
# #
# @VALGRIND_CHECK_RULES@ # @VALGRIND_CHECK_RULES@
# VALGRIND_SUPPRESSIONS_FILES = my-project.supp # VALGRIND_SUPPRESSIONS_FILES = my-project.supp
# EXTRA_DIST = my-project.supp # EXTRA_DIST = my-project.supp
# #
# This results in a "check-valgrind" rule being added to any Makefile.am # This results in a "check-valgrind" rule being added. Running `make
# which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been # check-valgrind` in that directory will recursively run the module's test
# configured with --enable-valgrind). Running `make check-valgrind` in # suite (`make check`) once for each of the available Valgrind tools (out
# that directory will run the module's test suite (`make check`) once for # of memcheck, helgrind and drd) while the sgcheck will be skipped unless
# each of the available Valgrind tools (out of memcheck, helgrind and drd) # enabled again on the commandline with --enable-valgrind-sgcheck. The
# while the sgcheck will be skipped unless enabled again on the # results for each check will be output to test-suite-$toolname.log. The
# commandline with --enable-valgrind-sgcheck. The results for each check # target will succeed if there are zero errors and fail otherwise.
# will be output to test-suite-$toolname.log. The target will succeed if
# there are zero errors and fail otherwise.
# #
# Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in # Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
# memcheck, helgrind, drd and sgcheck. These are useful because often only # memcheck, helgrind, drd and sgcheck. These are useful because often only
@@ -67,7 +65,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 15 #serial 23
dnl Configured tools dnl Configured tools
m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]]) m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]])
@@ -80,10 +78,14 @@ AC_DEFUN([AX_VALGRIND_DFLT],[
])dnl ])dnl
AC_DEFUN([AX_VALGRIND_CHECK],[ AC_DEFUN([AX_VALGRIND_CHECK],[
AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
m4_foreach([vgtool], [valgrind_tool_list],
[AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
dnl Check for --enable-valgrind dnl Check for --enable-valgrind
AC_ARG_ENABLE([valgrind], AC_ARG_ENABLE([valgrind],
[AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests (requires GNU make)])], [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
[enable_valgrind=$enableval],[enable_valgrind=no]) [enable_valgrind=$enableval],[enable_valgrind=])
AS_IF([test "$enable_valgrind" != "no"],[ AS_IF([test "$enable_valgrind" != "no"],[
# Check for Valgrind. # Check for Valgrind.
@@ -175,7 +177,7 @@ valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
valgrind_quiet_0 = --quiet valgrind_quiet_0 = --quiet
valgrind_v_use = $(valgrind_v_use_$(V)) valgrind_v_use = $(valgrind_v_use_$(V))
valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY)) valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%,%,$''@):; valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%-local,%,$''@):;
# Support running with and without libtool. # Support running with and without libtool.
ifneq ($(LIBTOOL),) ifneq ($(LIBTOOL),)
@@ -185,12 +187,12 @@ valgrind_lt =
endif endif
# Use recursive makes in order to ignore errors during check # Use recursive makes in order to ignore errors during check
check-valgrind: check-valgrind-local:
ifeq ($(VALGRIND_ENABLED),yes) ifeq ($(VALGRIND_ENABLED),yes)
$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
else else
@echo "Need to use GNU make and reconfigure with --enable-valgrind" @echo "Need to reconfigure with --enable-valgrind"
endif endif
# Valgrind running # Valgrind running
@@ -204,14 +206,16 @@ VALGRIND_LOG_COMPILER = \
$(valgrind_lt) \ $(valgrind_lt) \
$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
define valgrind_tool_rule = define valgrind_tool_rule
check-valgrind-$(1): check-valgrind-$(1)-local:
ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
ifneq ($$(TESTS),)
$$(valgrind_v_use)$$(MAKE) check-TESTS \ $$(valgrind_v_use)$$(MAKE) check-TESTS \
TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \ TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \ LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
LOG_FLAGS="$$(valgrind_$(1)_flags)" \ LOG_FLAGS="$$(valgrind_$(1)_flags)" \
TEST_SUITE_LOG=test-suite-$(1).log TEST_SUITE_LOG=test-suite-$(1).log
endif
else ifeq ($$(VALGRIND_ENABLED),yes) else ifeq ($$(VALGRIND_ENABLED),yes)
@echo "Need to reconfigure with --enable-valgrind-$(1)" @echo "Need to reconfigure with --enable-valgrind-$(1)"
else else
@@ -227,15 +231,9 @@ A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
MOSTLYCLEANFILES ?= MOSTLYCLEANFILES ?=
MOSTLYCLEANFILES += $(valgrind_log_files) MOSTLYCLEANFILES += $(valgrind_log_files)
.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools)) .PHONY: check-valgrind $(addprefix check-valgrind-,$(valgrind_tools))
'] ']
AS_IF([test "$enable_valgrind" != "yes"], [
VALGRIND_CHECK_RULES='
check-valgrind:
@echo "Need to use GNU make and reconfigure with --enable-valgrind"'
])
AC_SUBST([VALGRIND_CHECK_RULES]) AC_SUBST([VALGRIND_CHECK_RULES])
m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])]) m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
]) ])