diff options
author | Brent Cook <bcook@openbsd.org> | 2015-08-31 07:49:50 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-08-31 07:49:50 -0500 |
commit | afcfb2d5047075946a695819ba3723349feaf663 (patch) | |
tree | 31264ac18edd32f62a3dcc74339681eda8963271 | |
parent | 444749d1d531019160eeb91ea5056ea47580fae6 (diff) | |
download | portable-afcfb2d5047075946a695819ba3723349feaf663.tar.gz portable-afcfb2d5047075946a695819ba3723349feaf663.tar.bz2 portable-afcfb2d5047075946a695819ba3723349feaf663.zip |
add CP_LIBC, fix tls compilation
-rwxr-xr-x | update.sh | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -52,9 +52,15 @@ do_mv() { | |||
52 | rm -f "$1" | 52 | rm -f "$1" |
53 | fi | 53 | fi |
54 | } | 54 | } |
55 | CP='cp -p' | ||
56 | MV='do_mv' | 55 | MV='do_mv' |
57 | 56 | ||
57 | do_cp_libc() { | ||
58 | sed "/DEF_WEAK/d" < "$1" > "$2"/`basename "$1"` | ||
59 | } | ||
60 | CP_LIBC='do_cp_libc' | ||
61 | |||
62 | CP='cp -p' | ||
63 | |||
58 | $CP $libssl_src/src/LICENSE COPYING | 64 | $CP $libssl_src/src/LICENSE COPYING |
59 | 65 | ||
60 | $CP $libcrypto_src/crypto/arch/amd64/opensslconf.h include/openssl | 66 | $CP $libcrypto_src/crypto/arch/amd64/opensslconf.h include/openssl |
@@ -79,7 +85,7 @@ for i in crypto/compat libtls-standalone/compat; do | |||
79 | $libc_src/string/timingsafe_memcmp.c \ | 85 | $libc_src/string/timingsafe_memcmp.c \ |
80 | $libcrypto_src/crypto/getentropy_*.c \ | 86 | $libcrypto_src/crypto/getentropy_*.c \ |
81 | $libcrypto_src/crypto/arc4random_*.h; do | 87 | $libcrypto_src/crypto/arc4random_*.h; do |
82 | sed "/DEF_WEAK/d" < $j > $i/`basename "$j"` | 88 | $CP_LIBC $j $i |
83 | done | 89 | done |
84 | done | 90 | done |
85 | 91 | ||
@@ -192,8 +198,10 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | |||
192 | $CP $libtls_src/$i libtls-standalone/src | 198 | $CP $libtls_src/$i libtls-standalone/src |
193 | fi | 199 | fi |
194 | done | 200 | done |
195 | $CP $libc_src/string/strsep.c tls | 201 | |
196 | $CP $libc_src/string/strsep.c libtls-standalone/compat | 202 | $CP_LIBC $libc_src/string/strsep.c tls |
203 | $CP_LIBC $libc_src/string/strsep.c libtls-standalone/compat | ||
204 | |||
197 | mkdir -p libtls-standalone/m4 | 205 | mkdir -p libtls-standalone/m4 |
198 | $CP m4/check*.m4 \ | 206 | $CP m4/check*.m4 \ |
199 | m4/disable*.m4 \ | 207 | m4/disable*.m4 \ |