package/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch

   1 Fetched from: http://sourceforge.net/p/trousers/mailman/message/34728585/
   2 Upstream status: Submitted
   3
   4 From 924cbdfc67ca405aa4df2f9d3787365618b58630 Mon Sep 17 00:00:00 2001
   5 From: Samuel Martin <s.martin49@gmail.com>
   6 Date: Wed, 30 Dec 2015 00:06:33 +0100
   7 Subject: [PATCH] Makefile.am: make sure libintl is in LDFLAGS when needed
   8
   9 The build-system internally builds a couple of static libraries used to
  10 build the final programs.
  11
  12 When linking these libraries and the final programs, we need to
  13 explicitly tell libtool to link with libintl in order to resolve all the
  14 missing symbols.
  15
  16 This is done in the appropriate LDADD/LIBADD variables (or the per-target
  17 *_LDADD/*_LIBADD ones when they do not default to LDADD or LIBADD), for
  18 any sources using gettext/libintl functionalities.
  19
  20 This change fixes build failures [2,3] in cross-compilation, triggered by
  21 Buildroot buildfarms [1].
  22
  23 [1] http://autobuild.buildroot.org/
  24 [2] http://autobuild.buildroot.org/?reason=tpm-tools-1.3.8
  25 [3] http://autobuild.buildroot.org/results/c82/c82a6c1f41c561b15f10e7b7ffcaed15fa0ec895/build-end.log
  26
  27 Signed-off-by: Samuel Martin <s.martin49@gmail.com>
  28 ---
  29  lib/Makefile.am           | 6 +++---
  30  src/cmds/Makefile.am      | 2 +-
  31  src/data_mgmt/Makefile.am | 2 +-
  32  src/tpm_mgmt/Makefile.am  | 2 +-
  33  4 files changed, 6 insertions(+), 6 deletions(-)
  34
  35 diff --git a/lib/Makefile.am b/lib/Makefile.am
  36 index cef6a2f..c1d7009 100644
  37 --- a/lib/Makefile.am
  38 +++ b/lib/Makefile.am
  39 @@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES       =       tpm_utils.c \
  40  #
  41  # TSPI interface library
  42  libtpm_tspi_la_SOURCES =       tpm_tspi.c
  43 -libtpm_tspi_la_LIBADD  =       libtpm_utils.la -ldl
  44 +libtpm_tspi_la_LIBADD  =       libtpm_utils.la -ldl @INTLLIBS@
  45
  46  #
  47  # PKCS#11 interface library
  48 @@ -52,7 +52,7 @@ if P11_SUPPORT
  49  noinst_LTLIBRARIES     +=      libtpm_pkcs11.la
  50
  51  libtpm_pkcs11_la_SOURCES=      tpm_pkcs11.c
  52 -libtpm_pkcs11_la_LIBADD        =       libtpm_utils.la
  53 +libtpm_pkcs11_la_LIBADD        =       libtpm_utils.la @INTLLIBS@
  54  endif
  55
  56  #
  57 @@ -80,4 +80,4 @@ endif
  58  # Unseal library - for addition to existing apps, counter part of seal cmd
  59  libtpm_unseal_la_SOURCES =     tpm_unseal.c
  60  libtpm_unseal_la_LDFLAGS =     -shared -version-info 1:0:0
  61 -libtpm_unseal_la_LIBADD  =     -ltspi  libtpm_tspi.la
  62 +libtpm_unseal_la_LIBADD  =     -ltspi  libtpm_tspi.la @INTLLIBS@
  63 diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
  64 index de73ecf..27fc9ef 100644
  65 --- a/src/cmds/Makefile.am
  66 +++ b/src/cmds/Makefile.am
  67 @@ -30,7 +30,7 @@ else
  68  AM_CPPFLAGS    =       -I$(top_srcdir)/include -D_LINUX
  69  endif
  70
  71 -LDADD          =       $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
  72 +LDADD          =       $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
  73
  74  tpm_sealdata_SOURCES = tpm_sealdata.c
  75  tpm_unsealdata_SOURCES = tpm_unsealdata.c
  76 diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
  77 index f8bf41c..de505e4 100644
  78 --- a/src/data_mgmt/Makefile.am
  79 +++ b/src/data_mgmt/Makefile.am
  80 @@ -38,7 +38,7 @@ noinst_HEADERS =      data_common.h \
  81  # Common build flags
  82  AM_CPPFLAGS    =       -I$(top_srcdir)/include -D_LINUX
  83
  84 -LDADD          =       $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
  85 +LDADD          =       $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
  86
  87
  88  #
  89 diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
  90 index 195fba9..7ca47c9 100644
  91 --- a/src/tpm_mgmt/Makefile.am
  92 +++ b/src/tpm_mgmt/Makefile.am
  93 @@ -55,7 +55,7 @@ else
  94  AM_CPPFLAGS    =       -I$(top_srcdir)/include -D_LINUX
  95  endif
  96
  97 -LDADD          =       $(top_builddir)/lib/libtpm_tspi.la -ltspi
  98 +LDADD          =       $(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
  99
 100  tpm_startup_SOURCES =          tpm_startup.c
 101  tpm_reset_SOURCES =            tpm_reset.c
 102 --
 103 2.6.4
 104