Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mk-configure for openSUSE:Factory
checked in at 2022-12-07 17:35:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mk-configure (Old)
and /work/SRC/openSUSE:Factory/.mk-configure.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mk-configure"
Wed Dec 7 17:35:17 2022 rev:16 rq:1040791 version:0.38.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/mk-configure/mk-configure.changes
2021-06-11 22:31:30.054216177 +0200
+++ /work/SRC/openSUSE:Factory/.mk-configure.new.1835/mk-configure.changes
2022-12-07 17:36:36.581079457 +0100
@@ -1,0 +2,23 @@
+Tue Nov 29 20:00:00 UTC 2022 - v...@gmx.net
+
+- Update to 0.38.2
+
+ Fixes in tests
+
+-------------------------------------------------------------------
+Sun Nov 17 19:53:00 UTC 2022 - v...@gmx.net
+
+- Update to 0.38.1
+
+ Add support for .c++ extension for C++ sources
+
+ Fix some tests failures seen with bmake-20220418
+
+ Fix tests failures on tests/mkc_install seen on Darwin-21.6.0
+
+ Fix some tests ("mkcmake configure" does not support parallel
+ execution)
+
+ Fix examples/hello_lua test failure
+
+-------------------------------------------------------------------
Old:
----
mk-configure-0.37.0.tar.gz
New:
----
mk-configure-0.38.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mk-configure.spec ++++++
--- /var/tmp/diff_new_pack.rpj72y/_old 2022-12-07 17:36:37.061082085 +0100
+++ /var/tmp/diff_new_pack.rpj72y/_new 2022-12-07 17:36:37.065082107 +0100
@@ -17,7 +17,7 @@
Name: mk-configure
-Version: 0.37.0
+Version: 0.38.2
Release: 0
Summary: A build system on top of bmake
License: BSD-2-Clause AND MIT AND ISC
@@ -102,8 +102,8 @@
%check
unset MAKEFLAGS
env bmake test
-bmake -k cleandir-examples
-bmake -k cleandir-tests
+bmake nodeps-cleandir-examples
+bmake nodeps-cleandir-tests
%files
%doc README.md doc/FAQ doc/NEWS doc/TODO
++++++ mk-configure-0.37.0.tar.gz -> mk-configure-0.38.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/Makefile.inc
new/mk-configure-0.38.2/Makefile.inc
--- old/mk-configure-0.37.0/Makefile.inc 2021-04-08 20:00:18.000000000
+0200
+++ new/mk-configure-0.38.2/Makefile.inc 2022-11-29 19:09:00.000000000
+0100
@@ -1,4 +1,4 @@
-VERSION = 0.37.0
+VERSION = 0.38.2
BIRTHDATE = 2009-02-21
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/doc/NEWS
new/mk-configure-0.38.2/doc/NEWS
--- old/mk-configure-0.37.0/doc/NEWS 2021-04-08 20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/doc/NEWS 2022-11-29 19:09:00.000000000 +0100
@@ -1,4 +1,23 @@
======================================================================
+Version 0.38.2, by Aleksey Cheusov, Tue, 29 Nov 2022 22:04:54 +0400
+
+ Fixes in tests
+
+======================================================================
+Version 0.38.1, by Aleksey Cheusov, Sun, 27 Nov 2022 23:49:17 +0400
+
+ Add support for .c++ extension for C++ sources
+
+ Fix some tests failures seen with bmake-20220418
+
+ Fix tests failures on tests/mkc_install seen on Darwin-21.6.0
+
+ Fix some tests ("mkcmake configure" does not support parallel
+ execution)
+
+ Fix examples/hello_lua test failure
+
+======================================================================
Version 0.37.0, by Aleksey Cheusov, Thu, 8 Apr 2021 09:07:48 +0300
Features:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/doc/TODO
new/mk-configure-0.38.2/doc/TODO
--- old/mk-configure-0.37.0/doc/TODO 2021-04-08 20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/doc/TODO 2022-11-29 19:09:00.000000000 +0100
@@ -1,7 +1,42 @@
+============================================================
+Linker options like -rdynamic, -Wl,-E --version-script etc.
+should be checked as a part of mk-configure compilation time.
+tcc, for example, does not have --version-script on gnuld
+systems.
+
+============================================================
+export.sym:
+ * cpp-preprocessing
+
+============================================================
+If MKC_REQUIRE_* fails, remove only .res file and keep
+.c and .err in order to allow debugging!
+
+============================================================
+It seems that MKC_REQUIRE_PKGCONFIG does not remove _mkc.*.res
+and therefore requires to remove them manually
+
+============================================================
+New feature reallocarr from nbase800
+
+============================================================
+feature efun: new function ereallocarr
+
+============================================================
+progname feature: should provide __progname extern variable
############################################################
PLAN 0.38.0:
============================================================
+Fix parallel "install" target (LINKS vs. real files)
+
+============================================================
+Checks for attributes ===> mkc_imp.{cc,cxx}_xxx.mk
+
+============================================================
+Feature "macro" -- macro restrict/__restrict?
+
+============================================================
Generate .d files at the same time as compilation and load
in the very beginning by default if appropriate variable
is set.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/dictd/test.mk
new/mk-configure-0.38.2/examples/dictd/test.mk
--- old/mk-configure-0.37.0/examples/dictd/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/dictd/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -29,6 +29,7 @@
esac; \
\
echo =========== all ============; \
+ ${MAKE} ${MAKEFLAGS} configure > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -108,6 +109,7 @@
${MAKE} ${MAKEFLAGS} cleandir > /dev/null; \
\
echo ======= all-dict ==========; \
+ ${MAKE} ${MAKEFLAGS} configure-dict > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-dict > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -168,6 +170,7 @@
echo =========== all with NOSUBDIR ============; \
${MAKE} ${MAKEFLAGS} cleandir > /dev/null; \
NOSUBDIR='dictfmt dictzip'; export NOSUBDIR; \
+ ${MAKE} ${MAKEFLAGS} configure > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -175,12 +178,14 @@
\
echo =========== all with MKPIE=yes ============; \
${MAKE} ${MAKEFLAGS} cleandir > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure MKPIE=yes > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all MKPIE=yes > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo =========== all with STATICLIBS=everything... ============; \
${MAKE} ${MAKEFLAGS} cleandir > /dev/null; \
+ env STATICLIBS='libmaa libdz' ${MAKE} ${MAKEFLAGS} configure >
/dev/null; \
env STATICLIBS='libmaa libdz' ${MAKE} ${MAKEFLAGS} -j4 all > /dev/null;
\
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/files/test.mk
new/mk-configure-0.38.2/examples/files/test.mk
--- old/mk-configure-0.37.0/examples/files/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/files/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -10,12 +10,14 @@
echo CLEANDIRFILES=${CLEANDIRFILES:Q} | \
mkc_test_helper_paths; \
echo =========== all ============; \
+ ${MAKE} ${MAKEFLAGS} configure > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo ======== all+html ==========; \
MKHTML=yes; export MKHTML; \
+ ${MAKE} ${MAKEFLAGS} configure > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -43,7 +45,9 @@
\
echo ==== install MKINSTALL=no ====; \
MKINSTALL=no; export MKINSTALL; \
- ${MAKE} ${MAKEFLAGS} -j4 all installdirs install -j3 DESTDIR=${.OBJDIR}
\
+ ${MAKE} ${MAKEFLAGS} configure DESTDIR=${.OBJDIR} \
+ > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} -j4 all installdirs install DESTDIR=${.OBJDIR} \
> /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/files2/test.mk
new/mk-configure-0.38.2/examples/files2/test.mk
--- old/mk-configure-0.37.0/examples/files2/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/files2/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -35,7 +35,9 @@
\
echo ==== install MKINSTALL=no ====; \
MKINSTALL=no; export MKINSTALL; \
- ${MAKE} ${MAKEFLAGS} -j4 all installdirs install -j3 DESTDIR=${.OBJDIR}
\
+ ${MAKE} ${MAKEFLAGS} configure DESTDIR=${.OBJDIR} \
+ > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} -j4 all installdirs install DESTDIR=${.OBJDIR} \
> /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mk-configure-0.37.0/examples/hello_TARGETS/expect.out
new/mk-configure-0.38.2/examples/hello_TARGETS/expect.out
--- old/mk-configure-0.37.0/examples/hello_TARGETS/expect.out 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/hello_TARGETS/expect.out 2022-11-29
19:09:00.000000000 +0100
@@ -31,13 +31,9 @@
Coding style check for hello2
FAILED
*** Error code 1
-
Stop.
-bmake: stopped in /objdir/hello2
*** Error code 1
-
Stop.
-bmake: stopped in /objdir
cschk ex=1
============= files ===============
/objdir/Makefile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/hello_lua/expect.out
new/mk-configure-0.38.2/examples/hello_lua/expect.out
--- old/mk-configure-0.37.0/examples/hello_lua/expect.out 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/hello_lua/expect.out 2022-11-29
19:09:00.000000000 +0100
@@ -95,18 +95,18 @@
/objdir/foobar.in
/objdir/hello_lua.done
/objdir/hello_lua.test.out.tmp
-/objdir/home
-/objdir/home/cheusov
-/objdir/home/cheusov/local
-/objdir/home/cheusov/local/bin
-/objdir/home/cheusov/local/bin/foobar
-/objdir/home/cheusov/local/lib
-/objdir/home/cheusov/local/lib/lua
-/objdir/home/cheusov/local/lib/lua/X.Y
-/objdir/home/cheusov/local/lib/lua/X.Y/baz.so
-/objdir/home/cheusov/local/share
-/objdir/home/cheusov/local/share/lua
-/objdir/home/cheusov/local/share/lua/X.Y
-/objdir/home/cheusov/local/share/lua/X.Y/bar.lua
-/objdir/home/cheusov/local/share/lua/X.Y/foo.lua
+/objdir/opt
+/objdir/opt/vendor
+/objdir/prefix
+/objdir/prefix/bin
+/objdir/prefix/bin/foobar
+/objdir/prefix/lib
+/objdir/prefix/lib/lua
+/objdir/prefix/lib/lua/X.Y
+/objdir/prefix/lib/lua/X.Y/baz.so
+/objdir/prefix/share
+/objdir/prefix/share/lua
+/objdir/prefix/share/lua/X.Y
+/objdir/prefix/share/lua/X.Y/bar.lua
+/objdir/prefix/share/lua/X.Y/foo.lua
/objdir/test.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/hello_lua/test.mk
new/mk-configure-0.38.2/examples/hello_lua/test.mk
--- old/mk-configure-0.37.0/examples/hello_lua/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/hello_lua/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -38,13 +38,16 @@
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo ========= install2 ==========; \
- env PREFIX=/home/cheusov/local \
- LUA_LMODDIR=/home/cheusov/local/share/lua/5.1 \
- LUA_CMODDIR=/home/cheusov/local/lib/lua/5.1 \
- ${MAKE} ${MAKEFLAGS} all install -j3 DESTDIR=${.OBJDIR} \
+ PREFIX=/opt/vendor/name; \
+ LUA_LMODDIR=/opt/vendor/name/share/lua/5.1; \
+ LUA_CMODDIR=/opt/vendor/name/lib/lua/5.1; \
+ export PREFIX LUA_LMODDIR LUA_CMODDIR; \
+ ${MAKE} ${MAKEFLAGS} configure DESTDIR=${.OBJDIR} \
+ > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} all install -j3 DESTDIR=${.OBJDIR} \
> /dev/null; \
find ${.OBJDIR} -type f -o -type d | grep -Ev '_mkc_prog_lua' | \
- mkc_test_helper "${PREFIX}" "${.OBJDIR}" | uniq; \
+ mkc_test_helper $$PREFIX "${.OBJDIR}" | uniq; \
rm -rf ${.OBJDIR}/home; \
${MAKE} ${MAKEFLAGS} cleandir > /dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/helpers/mkc_test_helper
new/mk-configure-0.38.2/examples/helpers/mkc_test_helper
--- old/mk-configure-0.37.0/examples/helpers/mkc_test_helper 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/helpers/mkc_test_helper 2022-11-29
19:09:00.000000000 +0100
@@ -21,8 +21,7 @@
SORT_CMD=cat
fi
-grep -v CVS |
-grep -v '~$' |
+awk '!/CVS/ && !/~$/ && !/bmake: stopped in / && NF > 0' |
sed -e "s,$objdir,/objdir,g" \
-e "s,$prefix,/prefix,g" \
-e "s,/usr/local,/prefix," \
@@ -30,7 +29,6 @@
-e "s,/usr,/prefix," \
-e "s,/opt/local,/prefix," \
-e "s,/opt/pkgsrc4unix,/prefix," \
- -e "s,/opt,/prefix," \
-e 's/\([.][^ ]*\)[.]dylib/.so\1/' \
-e 's/[.]dylib/.so/' \
-e 's/[.]bundle/.so/' \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mk-configure-0.37.0/examples/helpers/mkc_test_helper2
new/mk-configure-0.38.2/examples/helpers/mkc_test_helper2
--- old/mk-configure-0.37.0/examples/helpers/mkc_test_helper2 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/helpers/mkc_test_helper2 2022-11-29
19:09:00.000000000 +0100
@@ -11,4 +11,6 @@
LC_ALL=C
export LC_ALL
-sed -e '/checking C\([+]\)* compiler type/ s|[.][.][.] .*|... mmm nnn|'
+sed -e '/checking C\([+]\)* compiler type/ s|[.][.][.] .*|... mmm nnn|' "$@" |
+grep -Ev 'ld: warning:.*was built for newer macOS version'
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/libdeps/test.mk
new/mk-configure-0.38.2/examples/libdeps/test.mk
--- old/mk-configure-0.37.0/examples/libdeps/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/libdeps/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -49,6 +49,7 @@
\
echo =========== all with STATICLIBS=... ============; \
${MAKE} ${MAKEFLAGS} cleandir > /dev/null; \
+ env STATICLIBS='libfoo libbar' ${MAKE} ${MAKEFLAGS} configure >
/dev/null; \
env STATICLIBS='libfoo libbar' ${MAKE} ${MAKEFLAGS} -j4 all >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/subprojects/test.mk
new/mk-configure-0.38.2/examples/subprojects/test.mk
--- old/mk-configure-0.37.0/examples/subprojects/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/subprojects/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -77,6 +77,7 @@
\
echo ======= library dependencies =======; \
PREFIX=${.CURDIR}/usr; export PREFIX; \
+ ${MAKE} ${MAKEFLAGS} configure >&2; \
${MAKE} ${MAKEFLAGS} all -j3 >&2; \
${MAKE} ${MAKEFLAGS} install -j3 >&2; \
LD_LIBRARY_PATH=${.CURDIR}/usr/lib; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/superfs/test.mk
new/mk-configure-0.38.2/examples/superfs/test.mk
--- old/mk-configure-0.37.0/examples/superfs/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/superfs/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -53,6 +53,7 @@
\
echo ==== install MKINSTALL=no ====; \
MKINSTALL=no; export MKINSTALL; \
+ ${MAKE} ${MAKEFLAGS} configure DESTDIR=${.OBJDIR} > /dev/null; \
${MAKE} ${MAKEFLAGS} all installdirs install -j3 DESTDIR=${.OBJDIR} \
> /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/tools/test.mk
new/mk-configure-0.38.2/examples/tools/test.mk
--- old/mk-configure-0.37.0/examples/tools/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/tools/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -71,6 +71,7 @@
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo ========= all-tools/prog1 ==========; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog1 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog1 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -84,6 +85,7 @@
\
echo ========= all-prog1 ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure-prog1 DESTDIR=${.OBJDIR} > /dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-prog1 DESTDIR=${.OBJDIR} > /dev/null; \
${MAKE} ${MAKEFLAGS} nodeps-all-prog1 DESTDIR=${.OBJDIR} > /dev/null; \
${MAKE} ${MAKEFLAGS} subdir-all-prog1 DESTDIR=${.OBJDIR} > /dev/null; \
@@ -93,12 +95,15 @@
\
echo ========= all-tools/prog2 ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog2 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog2 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo ========= -C tools/prog2 all ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} \
+ -C tools/prog2 configure DESTDIR=${.OBJDIR} > /dev/null; \
env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} -j4 \
-C tools/prog2 all DESTDIR=${.OBJDIR} > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
@@ -106,6 +111,7 @@
\
echo ========= all-tools/prog3 ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog3 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog3 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/examples/tools2/test.mk
new/mk-configure-0.38.2/examples/tools2/test.mk
--- old/mk-configure-0.37.0/examples/tools2/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/examples/tools2/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -72,6 +72,7 @@
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
\
echo ========= all-tools/prog1 ==========; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog1 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog1 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -85,6 +86,7 @@
\
echo ========= all-tools/prog2 ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog2 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog2 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -98,6 +100,7 @@
\
echo ========= all-tools/prog3 ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
+ ${MAKE} ${MAKEFLAGS} configure-tools/prog3 DESTDIR=${.OBJDIR} >
/dev/null; \
${MAKE} ${MAKEFLAGS} -j4 all-tools/prog3 DESTDIR=${.OBJDIR} >
/dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -105,6 +108,8 @@
echo ========= -C tools/prog4 all ==========; \
${MAKE} ${MAKEFLAGS} cleandir DESTDIR=${.OBJDIR} > /dev/null; \
env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} \
+ configure-tools/prog4 DESTDIR=${.OBJDIR} > /dev/null; \
+ env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} \
-j4 all-tools/prog4 DESTDIR=${.OBJDIR} > /dev/null; \
find ${.OBJDIR} -type f -o -type l | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -114,6 +119,8 @@
MKRELOBJDIR=yes; export MKRELOBJDIR; \
mkdir obj; \
env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} \
+ configure > /dev/null; \
+ env init_make_level=${next_level} ${MAKE} ${MAKEFLAGS} \
-j4 all > /dev/null; \
find obj -type f -o -type l | sort; \
rm -rf obj; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/mk/mkc_imp.checkprogs.mk
new/mk-configure-0.38.2/mk/mkc_imp.checkprogs.mk
--- old/mk-configure-0.37.0/mk/mkc_imp.checkprogs.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/mk/mkc_imp.checkprogs.mk 2022-11-29
19:09:00.000000000 +0100
@@ -13,7 +13,7 @@
MKC_PROG.id.${CC:[1]:S|+|x|g} = cc
.endif
-.if !empty(_srcsall:U:M*.cc) || !empty(_srcsall:U:M*.C) ||
!empty(_srcsall:U:M*.cxx) || !empty(_srcsall:U:M*.cpp) && !empty(CXX)
+.if !empty(_srcsall:U:M*.cc) || !empty(_srcsall:U:M*.C) ||
!empty(_srcsall:U:M*.cxx) || !empty(_srcsall:U:M*.cpp) ||
!empty(_srcsall:U:M*.c\+\+) && !empty(CXX)
MKC_REQUIRE_PROGS += ${CXX:[1]}
MKC_PROG.id.${CXX:[1]:S/+/x/g} = cxx
.endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/mk/mkc_imp.compiler_type.mk
new/mk-configure-0.38.2/mk/mkc_imp.compiler_type.mk
--- old/mk-configure-0.37.0/mk/mkc_imp.compiler_type.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/mk/mkc_imp.compiler_type.mk 2022-11-29
19:09:00.000000000 +0100
@@ -3,6 +3,7 @@
.if empty(src_type:Mcxx)
.if !empty(_srcsall:U:M*.cxx) || !empty(_srcsall:U:M*.cpp) || \
!empty(_srcsall:U:M*.C) || !empty(_srcsall:U:M*.cc) || \
+ !empty(_srcsall:U:M*.c\+\+) || \
!empty(MKC_CHECK_CXX_OPTS:U) || !empty(MKC_CHECK_CXXLD_OPTS:U)
src_type += cxx
LDREAL ?= ${CXX}
@@ -44,7 +45,8 @@
.if empty(src_type:Mcxx)
. for c in ${MKC_CHECK_CUSTOM:U} ${MKC_REQUIRE_CUSTOM:U}
. if !empty(MKC_CUSTOM_FN.${c}:U:M*.cxx) ||
!empty(MKC_CUSTOM_FN.${c}:U:M*.cpp) || \
- !empty(MKC_CUSTOM_FN.${c}:U:M*.C) || !empty(MKC_CUSTOM_FN.${c}:U:M*.cc)
+ !empty(MKC_CUSTOM_FN.${c}:U:M*.C) || !empty(MKC_CUSTOM_FN.${c}:U:M*.cc) ||
\
+ !empty(MKC_CUSTOM_FN.${c}:U:M*.c\+\+)
src_type += cxx
. endif
. endfor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/mk/mkc_imp.dep.mk
new/mk-configure-0.38.2/mk/mkc_imp.dep.mk
--- old/mk-configure-0.37.0/mk/mkc_imp.dep.mk 2021-04-08 20:00:18.000000000
+0200
+++ new/mk-configure-0.38.2/mk/mkc_imp.dep.mk 2022-11-29 19:09:00.000000000
+0100
@@ -21,8 +21,8 @@
# some of the rules involve .h sources, so remove them from mkdep line
.if defined(_SRCS_ALL)
-__DPSRCS.all = ${_SRCS_ALL:T:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/} \
- ${DPSRCS:T:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/}
+__DPSRCS.all = ${_SRCS_ALL:T:C/\.(c|m|s|S|C|cc|cpp|cxx|c\+\+)$/.d/} \
+ ${DPSRCS:T:C/\.(c|m|s|S|C|cc|cpp|cxx|c\+\+)$/.d/}
__DPSRCS.d = ${__DPSRCS.all:O:u:M*.d}
__DPSRCS.notd = ${__DPSRCS.all:O:u:N*.d}
@@ -68,7 +68,7 @@
@sed 's/^\([^ ]*\)[.]o\(.*\)$$/${MKDEP_SUFFIXES:C,^,\\\\1,}\2/'
${__DPSRCS.d} > ${.TARGET}
.endif
-.SUFFIXES: .d .s .S .c .C .cc .cpp .cxx
+.SUFFIXES: .d .s .S .c .C .c++ .cc .cpp .cxx
.c.d:
${MESSAGE.dep}
@@ -78,7 +78,7 @@
${MESSAGE.dep}
@env CC=${MKDEP_CC:Q} ${MKDEP.s} ${.IMPSRC}
-.C.d .cc.d .cpp.d .cxx.d:
+.C.d .c++.d .cc.d .cpp.d .cxx.d:
${MESSAGE.dep}
@env CC=${MKDEP_CC:Q} ${MKDEP.cc} ${.IMPSRC}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/mk/mkc_imp.rules.mk
new/mk-configure-0.38.2/mk/mkc_imp.rules.mk
--- old/mk-configure-0.37.0/mk/mkc_imp.rules.mk 2021-04-08 20:00:18.000000000
+0200
+++ new/mk-configure-0.38.2/mk/mkc_imp.rules.mk 2022-11-29 19:09:00.000000000
+0100
@@ -2,7 +2,7 @@
#
# See LICENSE file in the distribution.
############################################################
-.SUFFIXES: .a .o .op .os .s .S .c .cc .cpp .cxx .C .y .l .cl .p .h
+.SUFFIXES: .a .o .op .os .s .S .c .c++ .cc .cpp .cxx .C .y .l .cl .p .h
.LIBS: .a
@@ -19,13 +19,13 @@
${COMPILE.c} ${CFLAGS.pic} -o ${.TARGET} ${COPTS} ${COPTS_${_PN}}
${.IMPSRC}
# C++
-.cc.o .cpp.o .cxx.o .C.o:
+.c++.o .cc.o .cpp.o .cxx.o .C.o:
${MESSAGE.cc}
${COMPILE.cc} -o ${.TARGET} ${CXXOPTS} ${CXXOPTS_${_PN}} ${.IMPSRC}
-.cc.op .cpp.op .cxx.op .C.op:
+.c++.op .cc.op .cpp.op .cxx.op .C.op:
${MESSAGE.cc}
${COMPILE.cc} -o ${.TARGET} ${CXXOPTS} ${CXXOPTS_${_PN}} -pg ${.IMPSRC}
-.cc.os .cpp.os .cxx.os .C.os:
+.c++.os .cc.os .cpp.os .cxx.os .C.os:
${MESSAGE.cc}
${COMPILE.cc} ${CXXFLAGS.pic} -o ${.TARGET} ${CXXOPTS}
${CXXOPTS_${_PN}} ${.IMPSRC}
Binary files old/mk-configure-0.37.0/presentation/presentation.pdf and
new/mk-configure-0.38.2/presentation/presentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/scripts/mk-configure.7.in
new/mk-configure-0.38.2/scripts/mk-configure.7.in
--- old/mk-configure-0.37.0/scripts/mk-configure.7.in 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/scripts/mk-configure.7.in 2022-11-29
19:09:00.000000000 +0100
@@ -1276,7 +1276,7 @@
"C" or "C++" source filename or an executable program
for your custom check,
e.g., filename.c, filename.cc, subdir/filename.cxx, filename.C,
-filename.cpp or subdir/executable_script.
+filename.cpp, filename.c++ or subdir/executable_script.
.B mk-configure
tries to compile or run the specified file and sets
CUSTOM.<custom_check_name> variable to 1, 0 or other value.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/scripts/mkc_check_custom.in
new/mk-configure-0.38.2/scripts/mkc_check_custom.in
--- old/mk-configure-0.37.0/scripts/mkc_check_custom.in 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/scripts/mkc_check_custom.in 2022-11-29
19:09:00.000000000 +0100
@@ -122,7 +122,7 @@
*.c)
compiler="$CC"
flags="-o $tmpo $CFLAGS $CPPFLAGS $src_or_exe";;
- *.cc|*.C|*.cxx|*.cpp)
+ *.cc|*.C|*.cxx|*.cpp|*.c++)
compiler="$CXX"
flags="-o $tmpo $CXXFLAGS $CPPFLAGS $src_or_exe";;
*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/tests/mkc_install/expect.out
new/mk-configure-0.38.2/tests/mkc_install/expect.out
--- old/mk-configure-0.37.0/tests/mkc_install/expect.out 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/mkc_install/expect.out 2022-11-29
19:09:00.000000000 +0100
@@ -1,29 +1,29 @@
-/objdir/prefix
-/objdir/prefix/vendor
-/objdir/prefix/vendor/bin
+/objdir/opt
+/objdir/opt/vendor
+/objdir/opt/vendor/bin
=====
-/objdir/prefix
-/objdir/prefix/vendor
-/objdir/prefix/vendor/bin
-/objdir/prefix/vendor/bin/empty_file.txt
+/objdir/opt
+/objdir/opt/vendor
+/objdir/opt/vendor/bin
+/objdir/opt/vendor/bin/empty_file.txt
=====
permissions 0700 bin/empty2 ok
permissions 0750 sbin ok
permissions 0750 lib ok
=====
-Stripping /objdir/prefix/vendor/share/#inst.<NUM>#
-Stripping /objdir/prefix/vendor/share/#inst.<NUM>#
-/objdir/prefix
-/objdir/prefix/vendor
-/objdir/prefix/vendor/bin
-/objdir/prefix/vendor/bin/empty2
-/objdir/prefix/vendor/bin/empty_file.txt
-/objdir/prefix/vendor/lib
-/objdir/prefix/vendor/sbin
-/objdir/prefix/vendor/share
-/objdir/prefix/vendor/share/empty_file.txt
-/objdir/prefix/vendor/share/empty_file_copy
-/objdir/prefix/vendor/share/expect.out
+Stripping /objdir/opt/vendor/share/#inst.<NUM>#
+Stripping /objdir/opt/vendor/share/#inst.<NUM>#
+/objdir/opt
+/objdir/opt/vendor
+/objdir/opt/vendor/bin
+/objdir/opt/vendor/bin/empty2
+/objdir/opt/vendor/bin/empty_file.txt
+/objdir/opt/vendor/lib
+/objdir/opt/vendor/sbin
+/objdir/opt/vendor/share
+/objdir/opt/vendor/share/empty_file.txt
+/objdir/opt/vendor/share/empty_file_copy
+/objdir/opt/vendor/share/expect.out
=====
failed0
failed1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/tests/mkc_install/test.mk
new/mk-configure-0.38.2/tests/mkc_install/test.mk
--- old/mk-configure-0.37.0/tests/mkc_install/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/mkc_install/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -28,7 +28,7 @@
echo permissions 0750 lib bad; \
fi; \
echo =====; \
- uid=`${ID} -u`; gid=`${ID} -g`; \
+ uid=`${ID} -un`; gid=`${ID} -gn`; \
mkc_install -d; \
mkc_install -d -m 0755 -o "$$uid" -g "$$gid" \
${.CURDIR}/opt/vendor/share; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mk-configure-0.37.0/tests/predopost_targets/expect.out
new/mk-configure-0.38.2/tests/predopost_targets/expect.out
--- old/mk-configure-0.37.0/tests/predopost_targets/expect.out 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/predopost_targets/expect.out 2022-11-29
19:09:00.000000000 +0100
@@ -29,7 +29,6 @@
fake target pre_clean
fake target do_clean
fake target post_clean
-rm -rf /objdir/prefix /objdir/prefix
==================================================
cleandir ===> tests/predopost_targets/lib
fake target pre_cleandir
@@ -45,7 +44,6 @@
fake target pre_cleandir
fake target do_cleandir
fake target post_cleandir
-rm -rf /objdir/prefix /objdir/prefix
==================================================
install ===> tests/predopost_targets/lib
fake target pre_installdirs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/tests/predopost_targets/test.mk
new/mk-configure-0.38.2/tests/predopost_targets/test.mk
--- old/mk-configure-0.37.0/tests/predopost_targets/test.mk 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/predopost_targets/test.mk 2022-11-29
19:09:00.000000000 +0100
@@ -6,7 +6,7 @@
echo '=========== {pre,do,post}_recursive ============'; \
for t in errorcheck clean cleandir install all uninstall installdirs
depend; do \
${MAKE} ${MAKEFLAGS} -j1 $$t | \
- grep -v checking; \
+ grep -Ev 'checking|rm -rf '; \
done ; \
env MKINSTALLDIRS=no ${MAKE} ${MAKEFLAGS} -j1 install; \
} | env NOSORT=1 mkc_test_helper "${PREFIX}" "${.OBJDIR}"; \
@@ -14,7 +14,7 @@
echo '=========== {pre,do,post}_nonrec ============'; \
for t in bin_tar bin_targz bin_tarbz2 bin_zip bin_deb; do \
env INCFILE=Makefile.inc ${MAKE} ${MAKEFLAGS} -j1 $$t | \
- grep -v checking; \
+ grep -Ev 'checking|rm -rf '; \
done ; \
\
true =========== cleandir ============; \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mk-configure-0.37.0/tests/reqd_clean_cache/expect.out
new/mk-configure-0.38.2/tests/reqd_clean_cache/expect.out
--- old/mk-configure-0.37.0/tests/reqd_clean_cache/expect.out 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/reqd_clean_cache/expect.out 2022-11-29
19:09:00.000000000 +0100
@@ -18,9 +18,7 @@
ERROR: cannot find program brbrbr
ERROR: prototype test bad999 failed
*** Error code 1
-
Stop.
-bmake: stopped in /objdir
/objdir/Makefile
/objdir/_mkc_cc_type.err
/objdir/_mkc_cc_type.res
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mk-configure-0.37.0/tests/test_subprj_dash/Makefile
new/mk-configure-0.38.2/tests/test_subprj_dash/Makefile
--- old/mk-configure-0.37.0/tests/test_subprj_dash/Makefile 2021-04-08
20:00:18.000000000 +0200
+++ new/mk-configure-0.38.2/tests/test_subprj_dash/Makefile 2022-11-29
19:09:00.000000000 +0100
@@ -8,8 +8,10 @@
${MAKE} ${MAKEFLAGS} -f ${.CURDIR}/test.mk all 2>&1 | \
sed 's,n*b*make\[[0-9]*\],bmake,' | \
mkc_test_helper "${PREFIX}" "${.OBJDIR}" > $$tmp_out; \
- diff ${.CURDIR}/expect.out $$tmp_out && \
- echo ' succeeded' 1>&2 || \
- { echo ' FAILED' 1>&2; false; }
+ if diff ${.CURDIR}/expect.out $$tmp_out; then \
+ echo ' succeeded' 1>&2; \
+ else \
+ echo ' FAILED' 1>&2; false; \
+ fi
.include <mkc.subprj.mk>
