head 1.8; access; symbols netbsd-11-0-RC4:1.8 netbsd-11-0-RC3:1.8 netbsd-11-0-RC2:1.8 netbsd-11-0-RC1:1.8 perseant-exfatfs-base-20250801:1.8 netbsd-11:1.8.0.4 netbsd-11-base:1.8 netbsd-10-1-RELEASE:1.7 perseant-exfatfs-base-20240630:1.8 perseant-exfatfs:1.8.0.2 perseant-exfatfs-base:1.8 netbsd-8-3-RELEASE:1.5 netbsd-9-4-RELEASE:1.6 netbsd-10-0-RELEASE:1.7 netbsd-10-0-RC6:1.7 netbsd-10-0-RC5:1.7 netbsd-10-0-RC4:1.7 netbsd-10-0-RC3:1.7 netbsd-10-0-RC2:1.7 netbsd-10-0-RC1:1.7 netbsd-10:1.7.0.8 netbsd-10-base:1.7 netbsd-9-3-RELEASE:1.6 cjep_sun2x-base1:1.7 cjep_sun2x:1.7.0.6 cjep_sun2x-base:1.7 cjep_staticlib_x-base1:1.7 netbsd-9-2-RELEASE:1.6 cjep_staticlib_x:1.7.0.4 cjep_staticlib_x-base:1.7 netbsd-9-1-RELEASE:1.6 phil-wifi-20200421:1.7 phil-wifi-20200411:1.7 is-mlppp:1.7.0.2 is-mlppp-base:1.7 phil-wifi-20200406:1.7 netbsd-8-2-RELEASE:1.5 netbsd-9-0-RELEASE:1.6 netbsd-9-0-RC2:1.6 netbsd-9-0-RC1:1.6 phil-wifi-20191119:1.7 netbsd-9:1.6.0.2 netbsd-9-base:1.6 phil-wifi-20190609:1.6 netbsd-8-1-RELEASE:1.5 netbsd-8-1-RC1:1.5 pgoyette-compat-merge-20190127:1.5 pgoyette-compat-20190127:1.5 pgoyette-compat-20190118:1.5 pgoyette-compat-1226:1.5 pgoyette-compat-1126:1.5 pgoyette-compat-1020:1.5 pgoyette-compat-0930:1.5 pgoyette-compat-0906:1.5 netbsd-7-2-RELEASE:1.5 pgoyette-compat-0728:1.5 netbsd-8-0-RELEASE:1.5 phil-wifi:1.5.0.30 phil-wifi-base:1.5 pgoyette-compat-0625:1.5 netbsd-8-0-RC2:1.5 pgoyette-compat-0521:1.5 pgoyette-compat-0502:1.5 pgoyette-compat-0422:1.5 netbsd-8-0-RC1:1.5 pgoyette-compat-0415:1.5 pgoyette-compat-0407:1.5 pgoyette-compat-0330:1.5 pgoyette-compat-0322:1.5 pgoyette-compat-0315:1.5 netbsd-7-1-2-RELEASE:1.5 pgoyette-compat:1.5.0.28 pgoyette-compat-base:1.5 netbsd-7-1-1-RELEASE:1.5 matt-nb8-mediatek:1.5.0.26 matt-nb8-mediatek-base:1.5 perseant-stdc-iso10646:1.5.0.24 perseant-stdc-iso10646-base:1.5 netbsd-8:1.5.0.22 netbsd-8-base:1.5 prg-localcount2-base3:1.5 prg-localcount2-base2:1.5 prg-localcount2-base1:1.5 prg-localcount2:1.5.0.20 prg-localcount2-base:1.5 pgoyette-localcount-20170426:1.5 bouyer-socketcan-base1:1.5 pgoyette-localcount-20170320:1.5 netbsd-7-1:1.5.0.18 netbsd-7-1-RELEASE:1.5 netbsd-7-1-RC2:1.5 netbsd-7-nhusb-base-20170116:1.5 bouyer-socketcan:1.5.0.16 bouyer-socketcan-base:1.5 pgoyette-localcount-20170107:1.5 netbsd-7-1-RC1:1.5 pgoyette-localcount-20161104:1.5 netbsd-7-0-2-RELEASE:1.5 localcount-20160914:1.5 netbsd-7-nhusb:1.5.0.14 netbsd-7-nhusb-base:1.5 pgoyette-localcount-20160806:1.5 pgoyette-localcount-20160726:1.5 pgoyette-localcount:1.5.0.12 pgoyette-localcount-base:1.5 netbsd-7-0-1-RELEASE:1.5 netbsd-7-0:1.5.0.10 netbsd-7-0-RELEASE:1.5 netbsd-7-0-RC3:1.5 netbsd-7-0-RC2:1.5 netbsd-7-0-RC1:1.5 tls-maxphys-base:1.5 tls-maxphys:1.5.0.8 netbsd-7:1.5.0.6 netbsd-7-base:1.5 yamt-pagecache:1.5.0.4 yamt-pagecache-base9:1.5 tls-earlyentropy:1.5.0.2 tls-earlyentropy-base:1.5 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.5 riastradh-drm2-base3:1.5; locks; strict; comment @# @; 1.8 date 2023.06.03.21.31.45; author lukem; state Exp; branches; next 1.7; commitid r3TGTar07z3GZxrE; 1.7 date 2019.09.29.23.44.58; author mrg; state Exp; branches; next 1.6; commitid xrLFk44PaFrGTXEB; 1.6 date 2019.02.04.09.40.54; author mrg; state Exp; branches; next 1.5; commitid K8pFcsSE5o53QqaB; 1.5 date 2014.02.12.04.08.31; author jmmv; state Exp; branches 1.5.4.1 1.5.8.1 1.5.30.1; next 1.4; commitid IJjnEfqSqgwiqLox; 1.4 date 2014.02.11.17.28.21; author jmmv; state Exp; branches; next 1.3; commitid EH0Ff8bzsEAITHox; 1.3 date 2014.02.11.16.31.38; author jmmv; state Exp; branches; next 1.2; commitid svkcL09jxUZ7AHox; 1.2 date 2014.02.11.16.11.28; author jmmv; state Exp; branches; next 1.1; commitid f0JnLRSgeXBAtHox; 1.1 date 2014.02.08.19.15.33; author jmmv; state Exp; branches; next ; commitid ztjVNnlJqfnpAkox; 1.5.4.1 date 2014.02.12.04.08.31; author yamt; state dead; branches; next 1.5.4.2; commitid TzMwNuE6CLSD5yBx; 1.5.4.2 date 2014.05.22.15.40.13; author yamt; state Exp; branches; next ; commitid TzMwNuE6CLSD5yBx; 1.5.8.1 date 2014.02.12.04.08.31; author tls; state dead; branches; next 1.5.8.2; commitid jTnpym9Qu0o4R1Nx; 1.5.8.2 date 2014.08.19.23.45.55; author tls; state Exp; branches; next ; commitid jTnpym9Qu0o4R1Nx; 1.5.30.1 date 2019.06.10.21.42.47; author christos; state Exp; branches; next 1.5.30.2; commitid jtc8rnCzWiEEHGqB; 1.5.30.2 date 2020.04.13.07.45.49; author martin; state Exp; branches; next ; commitid X01YhRUPVUDaec4C; desc @@ 1.8 log @adapt to ${CC_WNO_MAYBE_UNINITIALIZED} Use ${CC_WNO_MAYBE_UNINITIALIZED} instead of the older style more complex expressions. Remove workarounds if they were for a specific version of gcc < 10. @ text @# $NetBSD: Makefile,v 1.7 2019/09/29 23:44:58 mrg Exp $ NOLINT= # defined .include LIB= tools LIBISCXX= yes LIBISPRIVATE= yes LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm .PATH: ${SRCDIR}/tools CPPFLAGS+= -I${SRCDIR}/tools WARNS?= 2 SRCS= application.cpp \ atffile.cpp \ config.cpp \ config_file.cpp \ env.cpp \ exceptions.cpp \ expand.cpp \ fs.cpp \ io.cpp \ parser.cpp \ process.cpp \ reader.cpp \ requirements.cpp \ signals.cpp \ test-program.cpp \ text.cpp \ timers.cpp \ ui.cpp \ user.cpp COPTS.parser.cpp += ${CC_WNO_MAYBE_UNINITIALIZED} .include @ 1.7 log @convert HAVE_GCC == 7 to HAVE_GCC >= 7. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $ d39 1 a39 3 .if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" COPTS.parser.cpp += -Wno-error=maybe-uninitialized .endif @ 1.6 log @with GCC 7, apply -Wno-error=maybe-uninitialized to parser.cpp. i don't really understand how to remove this warning, someone else could though, so feel free to :-) In file included from /usr/src/external/bsd/atf/dist/tools/parser.cpp:33:0: /usr/src/external/bsd/atf/dist/tools/parser.hpp: In member function 'tools::parser::token tools::parser::tokenizer::next() [with IS = std::basic_istream]': /usr/src/external/bsd/atf/dist/tools/parser.hpp:98:8: warning: '.tools::parser::token::m_line' may be used uninitialized in this function [-Wmaybe-uninitialized] struct token { ^~~~~ @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2014/02/12 04:08:31 jmmv Exp $ d39 1 a39 1 .if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" @ 1.5 log @Homogenize reachover build file structure with that of kyua-cli: - Move the majority of the common build definitions to the top-level Makefile.inc and ensure this gets included everywhere. - Move the bconfig.h file to the top-level directory. - Add a statically-generated defs.h file instead of creating one during the build. Easier to understand and less chances for things to go wrong. - Make sure all files using ATF_VERSION have the right dependency to trigger a rebuild when the value changes. - Clean up stale -I flags. This is all mostly for simplicity reasons and to reduce the cognitive load required to understand the build of the atf and kyua-* packages. I have tested this with both MKKYUA=no/yes and non-clean/clean builds so hopefully I got the details right. But if not, let me know please. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2014/02/11 17:28:21 jmmv Exp $ d39 4 @ 1.5.30.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2019/02/04 09:40:54 mrg Exp $ a38 4 .if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc" COPTS.parser.cpp += -Wno-error=maybe-uninitialized .endif @ 1.5.30.2 log @Mostly merge changes from HEAD upto 20200411 @ text @d1 1 a1 1 # $NetBSD$ d39 1 a39 1 .if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc" @ 1.5.8.1 log @file Makefile was added on branch tls-maxphys on 2014-08-19 23:45:55 +0000 @ text @d1 39 @ 1.5.8.2 log @Rebase to HEAD as of a few days ago. @ text @a0 39 # $NetBSD$ NOLINT= # defined .include LIB= tools LIBISCXX= yes LIBISPRIVATE= yes LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm .PATH: ${SRCDIR}/tools CPPFLAGS+= -I${SRCDIR}/tools WARNS?= 2 SRCS= application.cpp \ atffile.cpp \ config.cpp \ config_file.cpp \ env.cpp \ exceptions.cpp \ expand.cpp \ fs.cpp \ io.cpp \ parser.cpp \ process.cpp \ reader.cpp \ requirements.cpp \ signals.cpp \ test-program.cpp \ text.cpp \ timers.cpp \ ui.cpp \ user.cpp .include @ 1.5.4.1 log @file Makefile was added on branch yamt-pagecache on 2014-05-22 15:40:13 +0000 @ text @d1 39 @ 1.5.4.2 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @a0 39 # $NetBSD$ NOLINT= # defined .include LIB= tools LIBISCXX= yes LIBISPRIVATE= yes LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm .PATH: ${SRCDIR}/tools CPPFLAGS+= -I${SRCDIR}/tools WARNS?= 2 SRCS= application.cpp \ atffile.cpp \ config.cpp \ config_file.cpp \ env.cpp \ exceptions.cpp \ expand.cpp \ fs.cpp \ io.cpp \ parser.cpp \ process.cpp \ reader.cpp \ requirements.cpp \ signals.cpp \ test-program.cpp \ text.cpp \ timers.cpp \ ui.cpp \ user.cpp .include @ 1.4 log @Stop using bconfig.h in the tools code. Just assume the code is being built for NetBSD for simplicity reasons. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2014/02/11 16:31:38 jmmv Exp $ a12 1 .PATH: ${SRCDIR} a14 15 CPPFLAGS+= -DATF_ARCH=\"${MACHINE_ARCH}\" CPPFLAGS+= -DATF_BUILD_CC=\"/usr/bin/cc\" CPPFLAGS+= -DATF_BUILD_CFLAGS=\"\" CPPFLAGS+= -DATF_BUILD_CPP=\"/usr/bin/cpp\" CPPFLAGS+= -DATF_BUILD_CPPFLAGS=\"\" CPPFLAGS+= -DATF_BUILD_CXX=\"/usr/bin/c++\" CPPFLAGS+= -DATF_BUILD_CXXFLAGS=\"\" CPPFLAGS+= -DATF_CONFDIR=\"/etc/atf\" CPPFLAGS+= -DATF_INCLUDEDIR=\"/usr/include\" CPPFLAGS+= -DATF_LIBDIR=\"/usr/lib\" CPPFLAGS+= -DATF_LIBEXECDIR=\"/usr/libexec\" CPPFLAGS+= -DATF_MACHINE=\"${MACHINE}\" CPPFLAGS+= -DATF_PKGDATADIR=\"/usr/share/atf\" CPPFLAGS+= -DATF_SHELL=\"/bin/sh\" CPPFLAGS+= -DATF_WORKDIR=\"/tmp\" a15 1 CPPFLAGS+= -I. @ 1.3 log @Remove defs.hpp. Because we now own the 'tools' subdirectory in the tree, we can yank some of the upstream autoconf-related complexity. Start doing so by removing defs.hpp and using the real compiler attributes where necessary. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2014/02/11 16:11:28 jmmv Exp $ a15 1 CPPFLAGS+= -DHAVE_CONFIG_H a30 1 CPPFLAGS+= -DLAST_SIGNO=63 a32 1 CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For bconfig.h @ 1.2 log @Update reachover build files for atf-0.20. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $ a58 11 CLEANFILES+= defs.hpp beforedepend: defs.hpp defs.hpp: defs.hpp.in ${TOOL_SED} \ -e 's|@@ATTRIBUTE_FORMAT_PRINTF@@|__attribute__((__format__(__printf__, a, b)))|g' \ -e 's|@@ATTRIBUTE_NORETURN@@|__attribute__((__noreturn__))|g' \ -e 's|@@ATTRIBUTE_UNUSED@@|__attribute__((__unused__))|g' \ <${.ALLSRC} >${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} @ 1.1 log @Adjust reachover Makefiles for atf-0.19. The main change here is that the atf-config, atf-report, atf-run and atf-version tools no longer depend on libatf-c nor libatf-c++. Instead, they depend on an internal libtools.a that contains code specifically for these tools and nothing else, making them self-contained. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.20 2013/09/12 17:14:20 joerg Exp $ d32 1 @