Skip to content

Commit fc2ab18

Browse files
jimklimovjimklimov
authored
Merge pull request networkupstools#2360 from jimklimov/ccache-dir-autoconf
CI: Fix pure autoconf builds (CCACHE_DIR interaction) and some C/C++ warnings, and a `ChangeLog.pdf` fault on older systems
2 parents 7b225f5 + 6a874f1 commit fc2ab18

File tree

17 files changed

+210
-60
lines changed

17 files changed

+210
-60
lines changed

‎Jenkinsfile-dynamatrix‎

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ import org.nut.dynamatrix.*;
254254

255255
// Imported from jenkins-dynamatrix JSL vars/autotools.groovy:
256256
// a workaround for the cases of curiously missing MAKE envvar...
257-
dynacfgPipeline.buildPhases['distcheck'] = """( if [ x"\${MAKE-}" = x ]; then echo "WARNING: MAKE is somehow unset, defaulting!" >&2; MAKE=make; fi; eval \${CONFIG_ENVVARS} time \${MAKE} \${MAKE_OPTS} distcheck DISTCHECK_FLAGS="\${CONFIG_OPTS}" )"""
257+
dynacfgPipeline.buildPhases['distcheck'] = """( if [ x"\${MAKE-}" = x ]; then echo "WARNING: MAKE is somehow unset, defaulting!" >&2; MAKE=make; fi; eval \${CONFIG_ENVVARS} time \${MAKE} \${MAKE_OPTS} distcheck DISTCHECK_FLAGS=\${CONFIG_OPTS:+\\"\$CONFIG_OPTS\\"} )"""
258258

259259
// Note: shellcheck/spellcheck/... require autotools currently
260260
// or need to be redefined with respective BUILD_TYPE
@@ -285,7 +285,10 @@ set | sort -n """
285285
}
286286

287287
withEnvOptional(dynacfgPipeline.defaultTools) {
288-
unstashCleanSrc(dynacfgPipeline.stashnameSrc)
288+
stage('Unstash sources') {
289+
unstashCleanSrc(dynacfgPipeline.stashnameSrc)
290+
}
291+
289292
buildMatrixCellCI(dynacfgPipeline, dsbcClone, stageNameClone)
290293
//buildMatrixCellCI(dynacfgPipeline, dsbc, stageName)
291294
}
@@ -315,7 +318,10 @@ set | sort -n """
315318
}
316319

317320
withEnvOptional(dynacfgPipeline.defaultTools) {
318-
unstashCleanSrc(dynacfgPipeline.stashnameSrc)
321+
stage('Unstash sources') {
322+
unstashCleanSrc(dynacfgPipeline.stashnameSrc)
323+
}
324+
319325
def dynacfgPipeline_ciBuild = dynacfgPipeline.clone()
320326
dynacfgPipeline_ciBuild.buildSystem = 'ci_build.sh'
321327
dynacfgPipeline_ciBuild.buildPhases = [:]
@@ -421,6 +427,59 @@ set | sort -n """
421427
//'bodyParStages': {}
422428
] // one slowBuild filter configuration, autotools-Wall
423429

430+
,[name: 'Default autotools driven build with default configuration, bitness and warning levels on each NUT CI farm platform (but with fatal warnings as of gnu99/gnu++11)',
431+
disabled: dynacfgPipeline.disableSlowBuildAutotools,
432+
branchRegexSource: ~/^(PR-.+|fightwarn.*)$/,
433+
branchRegexTarget: dynacfgPipeline.branchStableRegex,
434+
//branchRegexTarget: ~/fightwarn/,
435+
appliesToChangedFilesRegex: dynacfgPipeline.appliesToChangedFilesRegex_C,
436+
'getParStages': { def dynamatrix, Closure body ->
437+
return dynamatrix.generateBuild([
438+
//commonLabelExpr: dynacfgBase.commonLabelExpr,
439+
//defaultDynamatrixConfig: dynacfgBase.defaultDynamatrixConfig,
440+
requiredNodelabels: [],
441+
excludedNodelabels: [],
442+
443+
dynamatrixAxesVirtualLabelsMap: [
444+
//'BITS': [32, 64],
445+
// 'CSTDVERSION': ['03', '2a'],
446+
//'CSTDVERSION_${KEY}': [ ['c': '03', 'cxx': '03'], ['c': '99', 'cxx': '98'], ['c': '17', 'cxx': '2a'], 'ansi' ],
447+
//'CSTDVERSION_${KEY}': [ ['c': '03', 'cxx': '03'], ['c': '99', 'cxx': '98'], ['c': '17', 'cxx': '2a'] ],
448+
'CSTDVERSION_${KEY}': [ ['c': '99', 'cxx': '11'] ],
449+
'CSTDVARIANT': ['gnu']
450+
],
451+
dynamatrixAxesCommonEnv: [
452+
// One set of several simultaneously exported envvars!
453+
// CONFIG_OPTS are picked up by our dynamatrix configuration
454+
// and substituted into shell "as is" for normal builds
455+
// (so splitting into many tokens), or quoted as a single
456+
// token DISTCHECK_FLAGS in its stage (split by make later).
457+
['LANG=C','LC_ALL=C','TZ=UTC',
458+
'CONFIG_OPTS=--with-all=auto --with-docs=auto --with-ssl=auto --enable-Werror --enable-warnings --disable-Wcolor --enable-silent-rules'
459+
]
460+
],
461+
462+
mergeMode: [ 'dynamatrixAxesVirtualLabelsMap': 'replace', 'excludeCombos': 'merge' ],
463+
allowedFailure: [
464+
dynacfgPipeline.axisCombos_WINDOWS,
465+
dynacfgPipeline.axisCombos_STRICT_C
466+
],
467+
runAllowedFailure: true,
468+
//dynamatrixAxesLabels: ['OS_FAMILY', 'OS_DISTRO', '${COMPILER}VER', 'ARCH${ARCH_BITS}'],
469+
//dynamatrixAxesLabels: [~/^OS/, '${COMPILER}VER', 'ARCH${ARCH_BITS}'],
470+
dynamatrixAxesLabels: [~/^OS_DISTRO/, 'COMPILER'],
471+
excludeCombos: dynacfgPipeline.excludeCombos_DEFAULT_STRICT_C
472+
+ [dynacfgPipeline.axisCombos_WINDOWS_CROSS]
473+
+ [[~/OS_DISTRO=openbsd-6\./, ~/COMPILER=GCC/]]
474+
// Here we picked just OSes and compilers (gcc or clang),
475+
// so exclude systems which have e.g. gcc-4.2.1 which claims
476+
// type range comparison warnings despite pragma fencing.
477+
// gcc-4.8.x on CentOS 7 and Ubuntu 14.04 looks already okay.
478+
], body)
479+
}, // getParStages
480+
//'bodyParStages': {}
481+
] // one slowBuild filter configuration, autotools-everywhere
482+
424483
,[name: 'Various non-docs distchecked target builds with main and ~newest supported C/C++ revisions (must pass on all platforms)',
425484
disabled: dynacfgPipeline.disableSlowBuildCIBuild,
426485
//branchRegexSource: ~/^(PR-.+|fightwarn.*)$/,

‎Makefile.am‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
11+
12+
# First target defines default behavior: all
13+
# We follow up with another pass to `make doc` because our wild recipes
14+
# sometimes preclude generating all of them on the first pass (FIXME!)
15+
# missing e.g. PDF and HTML which then pop up in `make check` footprint.
16+
all: all-recursive
17+
+@$(MAKE) $(AM_MAKEFLAGS) doc
1118

1219
# include directory for aclocal
1320
ACLOCAL_AMFLAGS = -I m4
@@ -324,11 +331,17 @@ dummy-stamp:
324331
ChangeLog: dummy-stamp
325332
+@$(MAKE) $(AM_MAKEFLAGS) $(abs_top_builddir)/ChangeLog
326333

334+
if WITH_PDF_NONASCII_TITLES
335+
WITH_PDF_NONASCII_TITLES_ENVVAR = WITH_PDF_NONASCII_TITLES=yes
336+
else
337+
WITH_PDF_NONASCII_TITLES_ENVVAR = WITH_PDF_NONASCII_TITLES=no
338+
endif
339+
327340
# Be sure to not confuse with a DIST'ed file (and so try to overwrite it):
328341
$(abs_top_builddir)/ChangeLog: tools/gitlog2changelog.py dummy-stamp
329342
@cd $(abs_top_srcdir) && \
330343
if test -e .git ; then \
331-
CHANGELOG_FILE="$@" $(abs_top_builddir)/tools/gitlog2changelog.py $(GITLOG_START_POINT) || \
344+
CHANGELOG_FILE="$@" $(WITH_PDF_NONASCII_TITLES_ENVVAR) $(abs_top_builddir)/tools/gitlog2changelog.py $(GITLOG_START_POINT) || \
332345
{ printf "gitlog2changelog.py failed to generate the ChangeLog.\n\nNOTE: See https://github.com/networkupstools/nut/commits/master for change history.\n\n" > "$@" ; } ; \
333346
else \
334347
if test x"$(abs_top_srcdir)" != x"$(abs_top_builddir)" -a -s ./ChangeLog ; then \

‎clients/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
1111

1212
EXTRA_DIST =
1313

‎common/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
1111

1212
AM_CFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
1313
AM_CXXFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include

‎common/nutstream.cpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,23 @@ static const char* getTmpDirPath() {
299299
return "/tmp";
300300
}
301301

302+
/* Pedantic builds complain about the static variable below...
303+
* It is assumed safe to ignore since it is a std::string with
304+
* no complex teardown at program exit.
305+
*/
306+
#if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP) && (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_EXIT_TIME_DESTRUCTORS || defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_GLOBAL_CONSTRUCTORS)
307+
#pragma GCC diagnostic push
308+
# ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_GLOBAL_CONSTRUCTORS
309+
# pragma GCC diagnostic ignored "-Wglobal-constructors"
310+
# endif
311+
# ifdef HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_EXIT_TIME_DESTRUCTORS
312+
# pragma GCC diagnostic ignored "-Wexit-time-destructors"
313+
# endif
314+
#endif
302315
const std::string NutFile::m_tmp_dir(getTmpDirPath());
316+
#if (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_PUSH_POP) && (defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_EXIT_TIME_DESTRUCTORS || defined HAVE_PRAGMA_GCC_DIAGNOSTIC_IGNORED_GLOBAL_CONSTRUCTORS)
317+
#pragma GCC diagnostic pop
318+
#endif
303319

304320
NutFile::NutFile(anonymous_t):
305321
m_name(""),

‎configure.ac‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2722,13 +2722,18 @@ dnl not fail if we have no tools to generate it (so add to SKIP list).
27222722
pdf*)
27232723
AC_MSG_CHECKING([if dblatex version can build ${nut_doc_build_target_base} (minimum required ${DBLATEX_MIN_VERSION})])
27242724
can_build_doc_pdf=no
2725+
can_build_doc_pdf_nonascii_titles=no
27252726
AX_COMPARE_VERSION([${DBLATEX_VERSION}], [ge], [${DBLATEX_MIN_VERSION}], [
27262727
( cd "$DOCTESTDIR" && ${A2X} --format=pdf --destination-dir=. "${abs_srcdir}"/docs/asciidoc.txt && test -s asciidoc.pdf ) && can_build_doc_pdf=yes
27272728
rm -f "${DOCTESTDIR}"/asciidoc.pdf
27282729
], [])
27292730
if test "${can_build_doc_pdf}" = yes ; then
27302731
AC_MSG_RESULT(yes)
27312732
DOC_BUILD_LIST="${DOC_BUILD_LIST} ${nut_doc_build_target_base}"
2733+
AC_MSG_CHECKING([if dblatex can process non-ASCII section titles for PDF])
2734+
( cd "$DOCTESTDIR" && sed -e 's/^Intro/'"`printf '\303\215'`"'ntro/' -e 's/Works in Progress/Works '"`printf '\303\255'`"'n Progress/' < "${abs_srcdir}"/docs/asciidoc.txt > asciidoc.tmp.txt && ${A2X} --format=pdf --destination-dir=. asciidoc.tmp.txt && test -s asciidoc.tmp.pdf ) && can_build_doc_pdf_nonascii_titles=yes
2735+
rm -f "${DOCTESTDIR}"/asciidoc.tmp.pdf
2736+
AC_MSG_RESULT(${can_build_doc_pdf_nonascii_titles})
27322737
else
27332738
AC_MSG_RESULT(no)
27342739
if test "${nut_doc_build_target_flag}" = "yes" ; then
@@ -2804,6 +2809,8 @@ no)
28042809
;;
28052810
esac
28062811

2812+
AM_CONDITIONAL(WITH_PDF_NONASCII_TITLES, [test x"$can_build_doc_pdf_nonascii_titles" = xyes])
2813+
28072814
NUT_REPORT_FEATURE([build specific documentation format(s)], [${nut_with_doc}], [${DOC_BUILD_LIST}],
28082815
[WITH_DOCS], [Define to enable overall documentation generation])
28092816

@@ -4784,6 +4791,19 @@ AC_ARG_VAR(CCACHE_BASEDIR)
47844791
AC_ARG_VAR(CCACHE_DIR)
47854792
AC_ARG_VAR(CCACHE_PATH)
47864793

4794+
dnl Some versions of ccache take poorly to an exported empty CCACHE_DIR etc.
4795+
dnl Avoid exporting them if not set at the configure time (assuming ci_build.sh
4796+
dnl integration or user's shell profile sets them persistently)
4797+
AS_IF([test x"${CCACHE_NAMESPACE-}" = x], [NUT_AM_EXPORT_CCACHE_NAMESPACE="#"], [NUT_AM_EXPORT_CCACHE_NAMESPACE=""])
4798+
AC_SUBST(NUT_AM_EXPORT_CCACHE_NAMESPACE)
4799+
AS_IF([test x"${CCACHE_BASEDIR-}" = x], [NUT_AM_EXPORT_CCACHE_BASEDIR="#"], [NUT_AM_EXPORT_CCACHE_BASEDIR=""])
4800+
AC_SUBST(NUT_AM_EXPORT_CCACHE_BASEDIR)
4801+
AS_IF([test x"${CCACHE_DIR-}" = x], [NUT_AM_EXPORT_CCACHE_DIR="#"], [NUT_AM_EXPORT_CCACHE_DIR=""])
4802+
AC_SUBST(NUT_AM_EXPORT_CCACHE_DIR)
4803+
4804+
dnl Application of PATH_DURING_CONFIGURE is also fenced by NUT_AM_EXPORT_CCACHE_PATH:
4805+
AS_IF([test x"${CCACHE_PATH-}" = x], [NUT_AM_EXPORT_CCACHE_PATH="#"], [NUT_AM_EXPORT_CCACHE_PATH=""])
4806+
AC_SUBST(NUT_AM_EXPORT_CCACHE_PATH)
47874807
PATH_DURING_CONFIGURE="$PATH"
47884808
AC_SUBST(PATH_DURING_CONFIGURE)
47894809

‎docs/Makefile.am‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,12 @@ $(top_builddir)/ChangeLog:
233233
# (and claims why: "Using $< in a non-suffix rule context is a GNUmake idiom"),
234234
# but it has a "$?" for "list of dependencies that are newer than the target".
235235
# For more details see https://man.freebsd.org/cgi/man.cgi
236+
if WITH_PDF_NONASCII_TITLES
237+
A2X_ASCII_IDS =
238+
else !WITH_PDF_NONASCII_TITLES
239+
A2X_ASCII_IDS = ":ascii-ids:\n"
240+
endif !WITH_PDF_NONASCII_TITLES
241+
236242
$(top_builddir)/ChangeLog.adoc: $(top_builddir)/ChangeLog
237243
@INPUT="$?"; \
238244
test -n "$${INPUT}" || INPUT="$$(top_builddir)/ChangeLog" ; \
@@ -244,7 +250,7 @@ $(top_builddir)/ChangeLog.adoc: $(top_builddir)/ChangeLog
244250
exit ; \
245251
} ; \
246252
echo " DOC-CHANGELOG-ASCIIDOC $${INPUT} => $@" \
247-
&& printf "ifdef::txt[]\n== Very detailed Change Log\nendif::txt[]\n\n" > "$@.tmp" \
253+
&& printf "ifdef::txt[]\n== Very detailed Change Log\n"$(A2X_ASCII_IDS)"endif::txt[]\n\n" > "$@.tmp" \
248254
&& TABCHAR="`printf '\t'`" \
249255
&& $(SED) \
250256
-e 's,^\([0-9a-zA-Z]\),=== \1,' \

‎drivers/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
1111

1212
# Make sure out-of-dir dependencies exist (especially when dev-building parts):
1313
$(top_builddir)/common/libcommon.la \

‎include/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
1111

1212
dist_noinst_HEADERS = attribute.h common.h extstate.h proto.h \
1313
state.h str.h timehead.h upsconf.h nut_float.h nut_stdint.h nut_platform.h \

‎lib/Makefile.am‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Export certain values for ccache which NUT ci_build.sh can customize,
44
# to facilitate developer iteration re-runs of "make" later.
55
# At least GNU and BSD make implementations are okay with this syntax.
6-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_DIR=@CCACHE_DIR@
9-
@NUT_AM_MAKE_CAN_EXPORT@export CCACHE_PATH=@CCACHE_PATH@
10-
@NUT_AM_MAKE_CAN_EXPORT@export PATH=@PATH_DURING_CONFIGURE@
6+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_NAMESPACE@export CCACHE_NAMESPACE=@CCACHE_NAMESPACE@
7+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_BASEDIR@export CCACHE_BASEDIR=@CCACHE_BASEDIR@
8+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_DIR@export CCACHE_DIR=@CCACHE_DIR@
9+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export CCACHE_PATH=@CCACHE_PATH@
10+
@NUT_AM_MAKE_CAN_EXPORT@@NUT_AM_EXPORT_CCACHE_PATH@export PATH=@PATH_DURING_CONFIGURE@
1111

1212
EXTRA_DIST = README.adoc
1313

0 commit comments

Comments
 (0)