summaryrefslogtreecommitdiff
path: root/security/trousers/files/patch-src-tcs-Makefile.am
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2016-05-18 18:30:09 +0000
committerHiroki Sato <hrs@FreeBSD.org>2016-05-18 18:30:09 +0000
commit47483f2f4f7a0f79d5336f7acd454e05bb660b9c (patch)
treefd61cfefcf35ffbcbd116c58855511bfb1172bf4 /security/trousers/files/patch-src-tcs-Makefile.am
parent- Fix pkg-message. (diff)
Fix an include path issue when security/openssl and
LOCALBASE/include/tddl.h are installed.
Notes
Notes: svn path=/head/; revision=415461
Diffstat (limited to 'security/trousers/files/patch-src-tcs-Makefile.am')
-rw-r--r--security/trousers/files/patch-src-tcs-Makefile.am17
1 files changed, 13 insertions, 4 deletions
diff --git a/security/trousers/files/patch-src-tcs-Makefile.am b/security/trousers/files/patch-src-tcs-Makefile.am
index 4746998522ff..820f81d98a1c 100644
--- a/security/trousers/files/patch-src-tcs-Makefile.am
+++ b/security/trousers/files/patch-src-tcs-Makefile.am
@@ -1,12 +1,21 @@
---- src/tcs/Makefile.am.orig 2014-04-24 18:05:44 UTC
-+++ src/tcs/Makefile.am
+--- src/tcs/Makefile.am.orig 2014-04-25 03:05:44.000000000 +0900
++++ src/tcs/Makefile.am 2016-05-19 03:02:33.269090000 +0900
@@ -1,4 +1,4 @@
-noinst_LIBRARIES=libtcs.a
+noinst_LIBRARIES=libtcs.a libtcs_emu.a
CFLAGS+=-I${top_srcdir}/src/include
libtcs_a_LIBADD=${top_builddir}/src/tddl/libtddl.a
-@@ -140,3 +140,143 @@ if TSS_BUILD_CMK
+@@ -91,7 +91,7 @@
+ if TSS_BUILD_KEY
+ libtcs_a_SOURCES+=tcsi_key.c tcs_key.c tcs_key_mem_cache.c tcs_context_key.c rpc/@RPC@/rpc_key.c \
+ crypto/@CRYPTO_PACKAGE@/crypto.c
+-libtcs_a_CFLAGS+=-DTSS_BUILD_KEY
++libtcs_a_CFLAGS+=-DTSS_BUILD_KEY -I@OPENSSL_INCLUDE_DIR@
+ endif
+ if TSS_BUILD_MAINT
+ libtcs_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c
+@@ -140,3 +140,143 @@
libtcs_a_SOURCES+=tcsi_cmk.c rpc/@RPC@/rpc_cmk.c
libtcs_a_CFLAGS+=-DTSS_BUILD_CMK
endif
@@ -101,7 +110,7 @@
+if TSS_BUILD_KEY
+libtcs_emu_a_SOURCES+=tcsi_key.c tcs_key.c tcs_key_mem_cache.c tcs_context_key.c rpc/@RPC@/rpc_key.c \
+ crypto/@CRYPTO_PACKAGE@/crypto.c
-+libtcs_emu_a_CFLAGS+=-DTSS_BUILD_KEY
++libtcs_emu_a_CFLAGS+=-DTSS_BUILD_KEY -I@OPENSSL_INCLUDE_DIR@
+endif
+if TSS_BUILD_MAINT
+libtcs_emu_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c