summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2016-05-19 05:34:27 +0000
committerHiroki Sato <hrs@FreeBSD.org>2016-05-19 05:34:27 +0000
commitdfff4725a6dd8c1963b72749024bd2d66ec5fb18 (patch)
tree6b2870c5310d981d222674a722b22e24f80f2b41 /security
parentwww/node: add armv6 support (diff)
Fix tcs/Makefile.am to use -I${top_srcdir}/src/include before
-I@OPENSSL_INCLUDE_DIR@.
Notes
Notes: svn path=/head/; revision=415491
Diffstat (limited to 'security')
-rw-r--r--security/trousers/files/patch-src-tcs-Makefile.am15
1 files changed, 10 insertions, 5 deletions
diff --git a/security/trousers/files/patch-src-tcs-Makefile.am b/security/trousers/files/patch-src-tcs-Makefile.am
index 820f81d98a1c..b9ac9f6530e8 100644
--- a/security/trousers/files/patch-src-tcs-Makefile.am
+++ b/security/trousers/files/patch-src-tcs-Makefile.am
@@ -1,12 +1,17 @@
--- 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 @@
++++ src/tcs/Makefile.am 2016-05-19 11:05:16.773730000 +0900
+@@ -1,8 +1,7 @@
-noinst_LIBRARIES=libtcs.a
+noinst_LIBRARIES=libtcs.a libtcs_emu.a
- CFLAGS+=-I${top_srcdir}/src/include
+-CFLAGS+=-I${top_srcdir}/src/include
libtcs_a_LIBADD=${top_builddir}/src/tddl/libtddl.a
-@@ -91,7 +91,7 @@
+-libtcs_a_CFLAGS=-DAPPID=\"TCSD\ TCS\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -fPIE -DPIE
++libtcs_a_CFLAGS=-I${top_srcdir}/src/include -DAPPID=\"TCSD\ TCS\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -fPIE -DPIE
+
+ libtcs_a_SOURCES=log.c \
+ tcs_caps.c \
+@@ -91,7 +90,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
@@ -15,7 +20,7 @@
endif
if TSS_BUILD_MAINT
libtcs_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c
-@@ -140,3 +140,143 @@
+@@ -140,3 +139,143 @@
libtcs_a_SOURCES+=tcsi_cmk.c rpc/@RPC@/rpc_cmk.c
libtcs_a_CFLAGS+=-DTSS_BUILD_CMK
endif