From 4c31730e2358bc781ad13288e2515e99f0c6ec86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 2 May 2011 23:40:21 +0200 Subject: [PATCH] app-crypt/tpm-tools update gold patch This fix building with a non-la-ridden trousers. R=davidjames,raymes BUG=none TEST=build with the CL from http://codereview.chromium.org/6883231/ Change-Id: I6a1681364352e0c2b9aee60d8c5ce1efac19e93c Review URL: http://codereview.chromium.org/6905157 --- .../tpm-tools/files/tpm-tools-1.3.1-gold.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch index 68d7ea3e26..37a1945c15 100644 --- a/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch +++ b/sdk_container/src/third_party/portage-stable/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch @@ -1,5 +1,19 @@ -diff --git a/tpm-tools-1.3.1/src/data_mgmt/Makefile.am b/tpm-tools-1.3.1-orig/src/data_mgmt/Makefile.am -index 697f031..cff5897 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -80,4 +80,4 @@ endif + # Unseal library - for addition to existing apps, counter part of seal cmd + libtpm_unseal_la_SOURCES = tpm_unseal.c + libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0 +-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la ++libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto +--- a/src/cmds/Makefile.am ++++ b/src/cmds/Makefile.am +@@ -33,4 +33,5 @@ endif + LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal + + tpm_sealdata_SOURCES = tpm_sealdata.c ++tpm_sealdata_LDADD = $(LDADD) -lcrypto + tpm_unsealdata_SOURCES = tpm_unsealdata.c --- tpm-tools-1.3.1/src/data_mgmt/Makefile.am +++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am @@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \