guestfs-tools/0007-Update-common-submodule-to-latest.patch

   1 From 6e80a33b70f89c18cd2fbde739243e8c5a7efc25 Mon Sep 17 00:00:00 2001
   2 From: "Richard W.M. Jones" <rjones@redhat.com>
   3 Date: Thu, 25 Mar 2021 08:14:49 +0000
   4 Subject: [PATCH 7/7] Update common submodule to latest.
   5
   6 ---
   7  common | 2 +-
   8  1 file changed, 1 insertion(+), 1 deletion(-)
   9
  10 Submodule common ca8a16a926..7c39a06fe3:
  11 diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am
  12 index 2b4aed8..650f18c 100644
  13 --- a/common/mlstdutils/Makefile.am
  14 +++ b/common/mlstdutils/Makefile.am
  15 @@ -85,7 +85,7 @@ OCAMLPACKAGES = \
  16         -I $(builddir)
  17  OCAMLPACKAGES_TESTS = $(MLSTDUTILS_CMA)
  18  if HAVE_OCAML_PKG_OUNIT
  19 -OCAMLPACKAGES_TESTS += -package oUnit
  20 +OCAMLPACKAGES_TESTS += -package ounit2
  21  endif
  22
  23  OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) -ccopt '$(CFLAGS)'
  24 diff --git a/common/mltools/Makefile.am b/common/mltools/Makefile.am
  25 index 6bb2b88..5cec178 100644
  26 --- a/common/mltools/Makefile.am
  27 +++ b/common/mltools/Makefile.am
  28 @@ -129,7 +129,7 @@ if HAVE_OCAML_PKG_GETTEXT
  29  OCAMLPACKAGES += -package gettext-stub
  30  endif
  31  if HAVE_OCAML_PKG_OUNIT
  32 -OCAMLPACKAGES_TESTS += -package oUnit
  33 +OCAMLPACKAGES_TESTS += -package ounit2
  34  endif
  35
  36  OCAMLCLIBS = \
  37 @@ -263,7 +263,8 @@ tools_utils_tests_DEPENDENCIES = \
  38         $(MLTOOLS_CMA) \
  39         $(top_srcdir)/ocaml-link.sh
  40  tools_utils_tests_LINK = \
  41 -       $(top_srcdir)/ocaml-link.sh -cclib '-lutils $(LIBXML2_LIBS) -lgnu' -- \
  42 +       $(top_srcdir)/ocaml-link.sh \
  43 +         -cclib '-pthread -lpthread -lutils $(LIBXML2_LIBS) -lgnu' -- \
  44           $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
  45           $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
  46           $(tools_utils_tests_THEOBJECTS) -o $@
  47 @@ -290,7 +291,8 @@ JSON_tests_DEPENDENCIES = \
  48         $(MLTOOLS_CMA) \
  49         $(top_srcdir)/ocaml-link.sh
  50  JSON_tests_LINK = \
  51 -       $(top_srcdir)/ocaml-link.sh -- \
  52 +       $(top_srcdir)/ocaml-link.sh \
  53 +         -cclib '-pthread -lpthread' -- \
  54           $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
  55           $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
  56           $(JSON_tests_THEOBJECTS) -o $@
  57 @@ -303,7 +305,8 @@ JSON_parser_tests_DEPENDENCIES = \
  58         $(MLTOOLS_CMA) \
  59         $(top_srcdir)/ocaml-link.sh
  60  JSON_parser_tests_LINK = \
  61 -       $(top_srcdir)/ocaml-link.sh -cclib '$(OCAMLCLIBS)' -- \
  62 +       $(top_srcdir)/ocaml-link.sh \
  63 +         -cclib '-pthread -lpthread $(OCAMLCLIBS)' -- \
  64           $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
  65           $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
  66           $(JSON_parser_tests_THEOBJECTS) -o $@
  67 diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am
  68 index e86d7bb..17dfac3 100644
  69 --- a/common/mlutils/Makefile.am
  70 +++ b/common/mlutils/Makefile.am
  71 @@ -112,10 +112,10 @@ c_utils_unit_tests_CFLAGS = $(libmlcutils_a_CFLAGS)
  72  if !HAVE_OCAMLOPT
  73  # Can't call this c_utils_unit_tests_OBJECTS because automake gets confused.
  74  c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_BOBJECTS)
  75 -c_utils_unit_tests.cmo: OCAMLPACKAGES += -package oUnit
  76 +c_utils_unit_tests.cmo: OCAMLPACKAGES += -package ounit2
  77  else
  78  c_utils_unit_tests_THEOBJECTS = $(c_utils_unit_tests_XOBJECTS)
  79 -c_utils_unit_tests.cmx: OCAMLPACKAGES += -package oUnit
  80 +c_utils_unit_tests.cmx: OCAMLPACKAGES += -package ounit2
  81  endif
  82
  83  OCAMLLINKFLAGS = \
  84 @@ -131,7 +131,7 @@ c_utils_unit_tests_DEPENDENCIES = \
  85  c_utils_unit_tests_LINK = \
  86         $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
  87           $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \
  88 -         $(OCAMLPACKAGES) -package oUnit \
  89 +         $(OCAMLPACKAGES) -package ounit2 \
  90           $(OCAMLLINKFLAGS) \
  91           $(c_utils_unit_tests_THEOBJECTS) -o $@
  92
  93 --
  94 2.29.0.rc2
  95