Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 May 2016 05:34:27 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r415491 - head/security/trousers/files
Message-ID:  <201605190534.u4J5YR6I087311@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Thu May 19 05:34:27 2016
New Revision: 415491
URL: https://svnweb.freebsd.org/changeset/ports/415491

Log:
  Fix tcs/Makefile.am to use -I${top_srcdir}/src/include before
  -I@OPENSSL_INCLUDE_DIR@.

Modified:
  head/security/trousers/files/patch-src-tcs-Makefile.am

Modified: head/security/trousers/files/patch-src-tcs-Makefile.am
==============================================================================
--- head/security/trousers/files/patch-src-tcs-Makefile.am	Thu May 19 05:24:48 2016	(r415490)
+++ head/security/trousers/files/patch-src-tcs-Makefile.am	Thu May 19 05:34:27 2016	(r415491)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605190534.u4J5YR6I087311>