app-crypt/tpm-tools update gold 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

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=71650b5

[raymes, 2011-05-02 16:37:13]

Should this be in the same patch file as the gold fix?

On Sat, Apr 30, 2011 at 5:55 AM,  <flameeyes@chromium.org> wrote:
> Reviewers: davidjames, raymes,
>
> Description:
> 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
>
>
> Please review this at http://codereview.chromium.org/6905157/
>
> SVN Base: http://git.chromium.org/git/portage-stable.git@master
>
> Affected files:
>  M app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
>
>
> Index: app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
> diff --git a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
> b/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
> index
>
68d7ea3e26a5076bf0ae4628396a3c4eb5f9b3c4..37a1945c15a359048096fceea001748cc3ceb66e
> 100644
> --- a/app-crypt/tpm-tools/files/tpm-tools-1.3.1-gold.patch
> +++ b/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           \
>
>
>

[Flameeyes-Gentoo, 2011-05-02 16:43:04]

Il giorno lun, 02/05/2011 alle 09.37 -0700, Raymes Khoury ha scritto:
> 
> Should this be in the same patch file as the gold fix? 

It is, upstream (i.e. Gentoo) and here.

The failure without .la files would not appear without gold, so there is
no reason to keep the two separated.

-- 
Diego Elio Pettenò — Flameeyes
http://blog.flameeyes.eu/

[raymes, 2011-05-02 16:45:51]

Thanks,

LGTM

On Mon, May 2, 2011 at 9:42 AM, Diego Elio Pettenò
<flameeyes@chromium.org> wrote:
> Il giorno lun, 02/05/2011 alle 09.37 -0700, Raymes Khoury ha scritto:
>>
>> Should this be in the same patch file as the gold fix?
>
> It is, upstream (i.e. Gentoo) and here.
>
> The failure without .la files would not appear without gold, so there is
> no reason to keep the two separated.
>
> --
> Diego Elio Pettenò — Flameeyes
> http://blog.flameeyes.eu/
>