commit: df2b358c36772c9ec9c2d43d7c10dc7e6a91240c
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 26 13:37:31 2026 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 26 13:37:31 2026 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=df2b358c
build-sys: push enabled features down in expansion vars
These can be picked up by e.g. tests to skip parts that require
features.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Makefile.in | 3 +++
autotools/gnulib/Makefile.in | 3 +++
configure | 15 +++++++++++++++
configure.ac | 9 +++++++++
libq/Makefile.in | 3 +++
tests/Makefile.in | 3 +++
tests/atom_compare/Makefile.in | 3 +++
tests/atom_explode/Makefile.in | 3 +++
tests/copy_file/Makefile.in | 3 +++
tests/init.sh.in | 5 +++++
tests/install/Makefile.in | 3 +++
tests/mkdir/Makefile.in | 3 +++
tests/profile/Makefile.in | 3 +++
tests/qatom/Makefile.in | 3 +++
tests/qcheck/Makefile.in | 3 +++
tests/qdepends/Makefile.in | 3 +++
tests/qfile/Makefile.in | 3 +++
tests/qlist/Makefile.in | 3 +++
tests/qlop/Makefile.in | 3 +++
tests/qmanifest/Makefile.in | 3 +++
tests/qmerge/Makefile.in | 3 +++
tests/qmerge/dotest | 30 ++++++++++++++++--------------
tests/qtbz2/Makefile.in | 3 +++
tests/quse/Makefile.in | 3 +++
tests/qxpak/Makefile.in | 3 +++
tests/rmspace/Makefile.in | 3 +++
tests/source/Makefile.in | 3 +++
27 files changed, 114 insertions(+), 14 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 4eca48eb..b0c54b5f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -862,6 +862,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1235,6 +1237,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/autotools/gnulib/Makefile.in b/autotools/gnulib/Makefile.in
index 17ade35a..9a641481 100644
--- a/autotools/gnulib/Makefile.in
+++ b/autotools/gnulib/Makefile.in
@@ -1174,6 +1174,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1547,6 +1549,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/configure b/configure
index 4de7c8c0..a94ae9e6 100755
--- a/configure
+++ b/configure
@@ -660,6 +660,9 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
CWFLAGS
+GTREE_ENABLED
+GPKG_ENABLED
+QMANIFEST_ENABLED
GTREE_ENABLED_FALSE
GTREE_ENABLED_TRUE
GPKG_ENABLED_FALSE
@@ -31244,6 +31247,7 @@ printf "%s\n" "no: disabled by configure argument" >&6;
}
esac
fi
+do_qmanifest=""
if test "x$enable_qmanifest" != xno; then
QMANIFEST_ENABLED_TRUE=
QMANIFEST_ENABLED_FALSE='#'
@@ -31256,6 +31260,7 @@ if test "x$enable_qmanifest" != xno ; then
printf "%s\n" "#define ENABLE_QMANIFEST 1" >>confdefs.h
+ do_qmanifest="yes"
fi
if test "x${enable_gpkg}" != "xno"
@@ -31287,6 +31292,7 @@ printf "%s\n" "no: disabled by configure argument" >&6;
}
esac
fi
+do_gpkg=""
if test "x$enable_gpkg" != xno; then
GPKG_ENABLED_TRUE=
GPKG_ENABLED_FALSE='#'
@@ -31299,6 +31305,7 @@ if test "x$enable_gpkg" != xno ; then
printf "%s\n" "#define ENABLE_GPKG 1" >>confdefs.h
+ do_gpkg="yes"
fi
if test "x${enable_gtree}" != "xno"
@@ -31330,6 +31337,7 @@ printf "%s\n" "no: disabled by configure argument" >&6;
}
esac
fi
+do_gtree=""
if test "x$enable_gtree" != xno; then
GTREE_ENABLED_TRUE=
GTREE_ENABLED_FALSE='#'
@@ -31342,7 +31350,14 @@ if test "x$enable_gtree" != xno ; then
printf "%s\n" "#define ENABLE_GTREE 1" >>confdefs.h
+ do_gtree="yes"
fi
+QMANIFEST_ENABLED="$do_qmanifest"
+
+GPKG_ENABLED="$do_gpkg"
+
+GTREE_ENABLED="$do_gtree"
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler
vendor" >&5
printf %s "checking for C compiler vendor... " >&6; }
diff --git a/configure.ac b/configure.ac
index 213755b5..e310488e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,10 +142,12 @@ AS_IF([test "x${enable_qmanifest}" != "xno"], [
AC_MSG_RESULT([no: disabled by configure argument])
])
+do_qmanifest=""
AM_CONDITIONAL([QMANIFEST_ENABLED], [test "x$enable_qmanifest" != xno])
if test "x$enable_qmanifest" != xno ; then
AC_DEFINE([ENABLE_QMANIFEST], [1],
[Define if qmanifest should be compiled])
+ do_qmanifest="yes"
fi
AS_IF([test "x${enable_gpkg}" != "xno"], [
@@ -160,10 +162,12 @@ AS_IF([test "x${enable_gpkg}" != "xno"], [
AC_MSG_RESULT([no: disabled by configure argument])
])
+do_gpkg=""
AM_CONDITIONAL([GPKG_ENABLED], [test "x$enable_gpkg" != xno])
if test "x$enable_gpkg" != xno ; then
AC_DEFINE([ENABLE_GPKG], [1],
[Define if gpkg should be compiled])
+ do_gpkg="yes"
fi
AS_IF([test "x${enable_gtree}" != "xno"], [
@@ -178,11 +182,16 @@ AS_IF([test "x${enable_gtree}" != "xno"], [
AC_MSG_RESULT([no: disabled by configure argument])
])
+do_gtree=""
AM_CONDITIONAL([GTREE_ENABLED], [test "x$enable_gtree" != xno])
if test "x$enable_gtree" != xno ; then
AC_DEFINE([ENABLE_GTREE], [1],
[Define if gtree should be compiled])
+ do_gtree="yes"
fi
+AC_SUBST([QMANIFEST_ENABLED], ["$do_qmanifest"])
+AC_SUBST([GPKG_ENABLED], ["$do_gpkg"])
+AC_SUBST([GTREE_ENABLED], ["$do_gtree"])
AX_CFLAGS_WARN_ALL([CWFLAGS])
AC_DEFUN([PT_CHECK_CFLAG],[AX_CHECK_COMPILER_FLAGS([$1],[CFLAGS="$CFLAGS
$1"])])
diff --git a/libq/Makefile.in b/libq/Makefile.in
index de342f81..27706269 100644
--- a/libq/Makefile.in
+++ b/libq/Makefile.in
@@ -762,6 +762,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1135,6 +1137,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0c46d09b..c69ed9d7 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -750,6 +750,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1123,6 +1125,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/atom_compare/Makefile.in b/tests/atom_compare/Makefile.in
index 681b4cba..6b8e7f8c 100644
--- a/tests/atom_compare/Makefile.in
+++ b/tests/atom_compare/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/atom_explode/Makefile.in b/tests/atom_explode/Makefile.in
index 74205b70..04dcea0f 100644
--- a/tests/atom_explode/Makefile.in
+++ b/tests/atom_explode/Makefile.in
@@ -733,6 +733,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1106,6 +1108,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/copy_file/Makefile.in b/tests/copy_file/Makefile.in
index d35006f3..c6874ad1 100644
--- a/tests/copy_file/Makefile.in
+++ b/tests/copy_file/Makefile.in
@@ -734,6 +734,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1107,6 +1109,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/init.sh.in b/tests/init.sh.in
index 861257e8..3655dd61 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -28,6 +28,11 @@ export PORTAGE_CONFIGROOT="${ab}/not/a/real/path"
# Always use UTC for timestamps to keep tests stable. #551806
export TZ='UTC 0'
+# from configure
+export QMANIFEST_ENABLED="@QMANIFEST_ENABLED@"
+export GPKG_ENABLED="@GPKG_ENABLED@"
+export GTREE_ENABLED="@GTREE_ENABLED@"
+
# create symlinks for applets
q -i -q
diff --git a/tests/install/Makefile.in b/tests/install/Makefile.in
index 6d94f25f..cbd131c6 100644
--- a/tests/install/Makefile.in
+++ b/tests/install/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/mkdir/Makefile.in b/tests/mkdir/Makefile.in
index 1a22636b..131d5a60 100644
--- a/tests/mkdir/Makefile.in
+++ b/tests/mkdir/Makefile.in
@@ -733,6 +733,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1106,6 +1108,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/profile/Makefile.in b/tests/profile/Makefile.in
index 1af28aa3..131e98e5 100644
--- a/tests/profile/Makefile.in
+++ b/tests/profile/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qatom/Makefile.in b/tests/qatom/Makefile.in
index 88b7fde0..2dcbc050 100644
--- a/tests/qatom/Makefile.in
+++ b/tests/qatom/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qcheck/Makefile.in b/tests/qcheck/Makefile.in
index ccf3707b..7ffda0d7 100644
--- a/tests/qcheck/Makefile.in
+++ b/tests/qcheck/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qdepends/Makefile.in b/tests/qdepends/Makefile.in
index efa49c27..f26dae9b 100644
--- a/tests/qdepends/Makefile.in
+++ b/tests/qdepends/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qfile/Makefile.in b/tests/qfile/Makefile.in
index 488d41b3..a539190c 100644
--- a/tests/qfile/Makefile.in
+++ b/tests/qfile/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qlist/Makefile.in b/tests/qlist/Makefile.in
index 410f368e..9b5effb3 100644
--- a/tests/qlist/Makefile.in
+++ b/tests/qlist/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qlop/Makefile.in b/tests/qlop/Makefile.in
index ea07ca40..4b119ade 100644
--- a/tests/qlop/Makefile.in
+++ b/tests/qlop/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qmanifest/Makefile.in b/tests/qmanifest/Makefile.in
index 5b85dcfd..c9f85ade 100644
--- a/tests/qmanifest/Makefile.in
+++ b/tests/qmanifest/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qmerge/Makefile.in b/tests/qmerge/Makefile.in
index 5c88b2a4..b4df3b03 100644
--- a/tests/qmerge/Makefile.in
+++ b/tests/qmerge/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qmerge/dotest b/tests/qmerge/dotest
index ec9a2147..8070b144 100755
--- a/tests/qmerge/dotest
+++ b/tests/qmerge/dotest
@@ -181,20 +181,22 @@ for compr in "" brotli gzip bzip2 xz lz4 zstd lzip lzop ;
do
rm "${ROOT}"/pkgs/sys-devel/${pkgver}-r${rev}.tbz2
done
-# create a gpkg and merge it
-qtbz2 -j ${f} ${pkgver}.xpak "${ROOT}"/pkgs/sys-devel/${pkgver}-r${rev}.tbz2
-out=$(yes | qmerge -Fv =${pkgver}-r${rev})
-tend $? "qmerge-test: [ ] install ${pkgver}-r${rev}" || die "${out}"
-out=$(qpkg -g ${pkgver}-r${rev})
-tend $? "qmerge-test: [ ] build gpkg.tar" || die "${out}"
-ls -l "${ROOT}"/pkgs/sys-devel/
-rm "${ROOT}"/pkgs/sys-devel/${pkgver}-r${rev}.tbz2
-ls -l "${ROOT}"/pkgs/sys-devel/
-qlist -kIv
-out=$(yes | qmerge -Fv =${pkgver}-r${rev})
-tend $? "qmerge-test: [G] install ${pkgver}-r${rev}" || die "${out}"
-out=$(yes | qmerge -FU qmerge-test)
-tend $? "qmerge-test: [G] uninstall ${pkgver}-r${rev}" || die "${out}"
+if [[ -n ${GPKG_ENABLED} ]] ; then
+ # create a gpkg and merge it
+ qtbz2 -j ${f} ${pkgver}.xpak
"${ROOT}"/pkgs/sys-devel/${pkgver}-r${rev}.tbz2
+ out=$(yes | qmerge -Fv =${pkgver}-r${rev})
+ tend $? "qmerge-test: [ ] install ${pkgver}-r${rev}" || die "${out}"
+ out=$(qpkg -g ${pkgver}-r${rev})
+ tend $? "qmerge-test: [ ] build gpkg.tar" || die "${out}"
+ ls -l "${ROOT}"/pkgs/sys-devel/
+ rm "${ROOT}"/pkgs/sys-devel/${pkgver}-r${rev}.tbz2
+ ls -l "${ROOT}"/pkgs/sys-devel/
+ qlist -kIv
+ out=$(yes | qmerge -Fv =${pkgver}-r${rev})
+ tend $? "qmerge-test: [G] install ${pkgver}-r${rev}" || die "${out}"
+ out=$(yes | qmerge -FU qmerge-test)
+ tend $? "qmerge-test: [G] uninstall ${pkgver}-r${rev}" || die "${out}"
+fi
cleantmpdir
diff --git a/tests/qtbz2/Makefile.in b/tests/qtbz2/Makefile.in
index 7b3e2c21..403e16b2 100644
--- a/tests/qtbz2/Makefile.in
+++ b/tests/qtbz2/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/quse/Makefile.in b/tests/quse/Makefile.in
index 0bff2f09..188a3598 100644
--- a/tests/quse/Makefile.in
+++ b/tests/quse/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/qxpak/Makefile.in b/tests/qxpak/Makefile.in
index 3cc0d94c..c69462cc 100644
--- a/tests/qxpak/Makefile.in
+++ b/tests/qxpak/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/rmspace/Makefile.in b/tests/rmspace/Makefile.in
index 9931140d..b708d593 100644
--- a/tests/rmspace/Makefile.in
+++ b/tests/rmspace/Makefile.in
@@ -733,6 +733,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1106,6 +1108,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
diff --git a/tests/source/Makefile.in b/tests/source/Makefile.in
index b3f21408..4b8d3401 100644
--- a/tests/source/Makefile.in
+++ b/tests/source/Makefile.in
@@ -689,6 +689,8 @@ GNULIB_LOCALEDIR_c = @GNULIB_LOCALEDIR_c@
GNULIB_LOCALEDIR_c_make = @GNULIB_LOCALEDIR_c_make@
GPGME_CFLAGS = @GPGME_CFLAGS@
GPGME_LIBS = @GPGME_LIBS@
+GPKG_ENABLED = @GPKG_ENABLED@
+GTREE_ENABLED = @GTREE_ENABLED@
HAVE_ALIGNED_ALLOC = @HAVE_ALIGNED_ALLOC@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_ALPHASORT = @HAVE_ALPHASORT@
@@ -1062,6 +1064,7 @@ PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
PRIPTR_PREFIX = @PRIPTR_PREFIX@
PTHREAD_H_DEFINES_STRUCT_TIMESPEC = @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
+QMANIFEST_ENABLED = @QMANIFEST_ENABLED@
RANLIB = @RANLIB@
REPLACE_ABORT = @REPLACE_ABORT@
REPLACE_ACCESS = @REPLACE_ACCESS@
