package/lttng-babeltrace/0003-fix-uuid-support-detection-on-static-build.patch

   1 From 2741f55be80ae8af169ae795ea28d2a39c18fa60 Mon Sep 17 00:00:00 2001
   2 From: Samuel Martin <s.martin49@gmail.com>
   3 Date: Wed, 1 Jun 2016 21:56:32 +0200
   4 Subject: [PATCH] configure: fix uuid support detection on static build
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This change adds uuid detection using pkg-config helper before falling
  10 back on the standard AC_CHECK_LIB detection for platforms missing
  11 pkg-config.
  12
  13 AC_CHECK_LIB function achieves its test by trying to link against the
  14 requested library, without taking care of its dependency
  15 requirements/flags that may differ between different targets.
  16 Therefore, in case of static build, it can fail on the uuid detection
  17 like [1], because the uuid's dependency flags (regarding gettext) are
  18 missing.
  19
  20 Instead, using pkg-config to do the check will take care of getting and
  21 setting all required flags.
  22
  23 This issue [1] has been triggered on Buildroot farms.
  24
  25 [1] http://autobuild.buildroot.net/results/43b/43b98ddf9eb44152ed9ac4a98d887af14831d8da/build-end.log
  26
  27 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  28 Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  29 [Philippe: grabbed from this upstream patch:
  30     https://github.com/efficios/babeltrace/commit/2741f55be80ae8af169ae795ea28d2a39c18fa60.patch
  31 ]
  32 Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
  33 ---
  34  configure.ac | 31 +++++++++++++++++++++----------
  35  1 file changed, 21 insertions(+), 10 deletions(-)
  36
  37 diff --git a/configure.ac b/configure.ac
  38 index 84f9000..2f5e3f8 100644
  39 --- a/configure.ac
  40 +++ b/configure.ac
  41 @@ -163,24 +163,35 @@ AC_CHECK_FUNCS([uuid_generate],
  42    link_with_libuuid=no
  43  ],
  44  [
  45 -  # Check for libuuid
  46 -  AC_CHECK_LIB([uuid], [uuid_generate],
  47 +  # First, check the pkg-config module is available, otherwise explicitly check
  48 +  # for libuuid, or uuid support in the C-library.
  49 +  PKG_CHECK_MODULES([UUID], [uuid],
  50    [
  51 +    LIBS="${UUID_LIBS} ${LIBS}"
  52 +    CFLAGS="${CFLAGS} ${UUID_CFLAGS}"
  53      AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
  54      link_with_libuuid=yes
  55    ],
  56    [
  57 -    # libuuid not found, check for uuid_create in libc.
  58 -    AC_CHECK_LIB([c], [uuid_create],
  59 +    # Check for libuuid
  60 +    AC_CHECK_LIB([uuid], [uuid_generate],
  61      [
  62 -      AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
  63 -      link_with_libc_uuid=yes
  64 +      AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
  65 +      link_with_libuuid=yes
  66      ],
  67      [
  68 -      # for MinGW32 we have our own internal implemenation of uuid using Windows functions.
  69 -      if test "x$MINGW32" = xno; then
  70 -        AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
  71 -      fi
  72 +      # libuuid not found, check for uuid_create in libc.
  73 +      AC_CHECK_LIB([c], [uuid_create],
  74 +      [
  75 +        AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
  76 +        link_with_libc_uuid=yes
  77 +      ],
  78 +      [
  79 +        # for MinGW32 we have our own internal implemenation of uuid using Windows functions.
  80 +        if test "x$MINGW32" = xno; then
  81 +          AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
  82 +        fi
  83 +      ])
  84      ])
  85    ])
  86  ])