toolchain/binutils/patches/2.40/035-Pass-JANSSON_LIBS-and-ZSTD_LIBS-to-ld-bootstrap-boot.patch

   1 From e1815414077347097e5bf0d75162add955e241d9 Mon Sep 17 00:00:00 2001
   2 From: Romain Geissler <romain.geissler@amadeus.com>
   3 Date: Sun, 5 Feb 2023 13:56:34 +0000
   4 Subject: [PATCH 35/50] Pass $JANSSON_LIBS and $ZSTD_LIBS to
   5  ld-bootstrap/bootrap.exp
   6
   7 ---
   8  ld/Makefile.am                          | 1 +
   9  ld/Makefile.in                          | 1 +
  10  ld/testsuite/ld-bootstrap/bootstrap.exp | 4 ++--
  11  3 files changed, 4 insertions(+), 2 deletions(-)
  12
  13 --- a/ld/Makefile.am
  14 +++ b/ld/Makefile.am
  15 @@ -992,6 +992,7 @@ check-DEJAGNU: site.exp
  16                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
  17                 OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
  18                 SFRAMELIB="$(TESTSFRAMELIB)" \
  19 +               JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \
  20                 LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \
  21                 DO_COMPARE="`echo '$(do_compare)' | sed -e 's,\\$$,,g'`" \
  22                 $(RUNTESTFLAGS); \
  23 --- a/ld/Makefile.in
  24 +++ b/ld/Makefile.in
  25 @@ -2645,6 +2645,7 @@ check-DEJAGNU: site.exp
  26                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
  27                 OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
  28                 SFRAMELIB="$(TESTSFRAMELIB)" \
  29 +               JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \
  30                 LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \
  31                 DO_COMPARE="`echo '$(do_compare)' | sed -e 's,\\$$,,g'`" \
  32                 $(RUNTESTFLAGS); \
  33 --- a/ld/testsuite/ld-bootstrap/bootstrap.exp
  34 +++ b/ld/testsuite/ld-bootstrap/bootstrap.exp
  35 @@ -162,13 +162,13 @@ foreach flags $test_flags {
  36      }
  37
  38      if { [lindex [remote_exec build grep "-q \"HAVE_ZSTD 1\" config.h" ] 0] == 0 } then {
  39 -       set extralibs "$extralibs -lzstd"
  40 +       set extralibs "$extralibs $ZSTD_LIBS"
  41      }
  42
  43      # Check if the system's jansson library is used. If so, the object files will
  44      # be using symbols from it, so link to it.
  45      if { [lindex [remote_exec build grep "-q \"HAVE_JANSSON 1\" config.h" ] 0] == 0 } then {
  46 -       set extralibs "$extralibs -ljansson"
  47 +       set extralibs "$extralibs $JANSSON_LIBS"
  48      }
  49
  50      # Plugin support requires linking with libdl.