diff options
author | Brent Cook <busterb@gmail.com> | 2014-07-10 22:06:10 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-07-21 12:08:18 -0500 |
commit | 5d8a1cf7155130bd8101090d7e1d0c2f90d9b123 (patch) | |
tree | 286f7d12e3647f94bd1e6e8e180a4bf6215a0740 /update.sh | |
parent | 7a4a37cf596697ae96eeb1c555989e6d1a443187 (diff) | |
download | portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.gz portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.tar.bz2 portable-5d8a1cf7155130bd8101090d7e1d0c2f90d9b123.zip |
add initial CMake and Visual Studio build support
This moves the compatibility include files from include to
include/compat so we can use the awful MS C compiler
<../include/> trick to emulate the GNU #include_next extension.
This also removes a few old compat files we do not need anymore.
Diffstat (limited to 'update.sh')
-rwxr-xr-x | update.sh | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -70,6 +70,7 @@ for i in crypto/compat libtls-standalone/compat; do | |||
70 | $libc_src/crypt/chacha_private.h \ | 70 | $libc_src/crypt/chacha_private.h \ |
71 | $libc_src/string/explicit_bzero.c \ | 71 | $libc_src/string/explicit_bzero.c \ |
72 | $libc_src/stdlib/reallocarray.c \ | 72 | $libc_src/stdlib/reallocarray.c \ |
73 | $libc_src/string/strcasecmp.c \ | ||
73 | $libc_src/string/strlcpy.c \ | 74 | $libc_src/string/strlcpy.c \ |
74 | $libc_src/string/strlcat.c \ | 75 | $libc_src/string/strlcat.c \ |
75 | $libc_src/string/strndup.c \ | 76 | $libc_src/string/strndup.c \ |
@@ -81,9 +82,9 @@ for i in crypto/compat libtls-standalone/compat; do | |||
81 | $i | 82 | $i |
82 | done | 83 | done |
83 | 84 | ||
84 | $CP include/stdlib.h \ | 85 | $CP include/compat/stdlib.h \ |
85 | include/string.h \ | 86 | include/compat/string.h \ |
86 | include/unistd.h \ | 87 | include/compat/unistd.h \ |
87 | libtls-standalone/include | 88 | libtls-standalone/include |
88 | 89 | ||
89 | $CP crypto/compat/arc4random*.h \ | 90 | $CP crypto/compat/arc4random*.h \ |
@@ -210,10 +211,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' apps/Makefile.am` ; do | |||
210 | $CP $openssl_app_src/$i apps | 211 | $CP $openssl_app_src/$i apps |
211 | fi | 212 | fi |
212 | done | 213 | done |
213 | patch -p0 < patches/openssl.c.patch | ||
214 | patch -p0 < patches/ossl_typ.h.patch | ||
215 | patch -p0 < patches/pkcs7.h.patch | ||
216 | patch -p0 < patches/x509.h.patch | ||
217 | 214 | ||
218 | # copy libssl source | 215 | # copy libssl source |
219 | echo "copying libssl source" | 216 | echo "copying libssl source" |
@@ -276,6 +273,11 @@ add_man_links() { | |||
276 | done | 273 | done |
277 | } | 274 | } |
278 | 275 | ||
276 | # apply local patches (Windows support) | ||
277 | for i in patches/*.patch; do | ||
278 | patch -p0 < $i | ||
279 | done | ||
280 | |||
279 | # copy manpages | 281 | # copy manpages |
280 | echo "copying manpages" | 282 | echo "copying manpages" |
281 | echo dist_man_MANS= > man/Makefile.am | 283 | echo dist_man_MANS= > man/Makefile.am |