diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-01-18 20:37:44 +0900 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2017-01-18 21:05:43 +0900 |
commit | 484feaae9157d8e4d91e81d305b9cd0ff6af0c91 (patch) | |
tree | 7cacb2743653c703365d027b388136d29dd82f80 | |
parent | 3276be122f6c5d3912bbfb266227335b65c9d851 (diff) | |
download | portable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.tar.gz portable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.tar.bz2 portable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.zip |
Stop generating .def files by update.sh
-rw-r--r-- | crypto/Makefile.am | 1 | ||||
-rw-r--r-- | crypto/crypto_win.list | 24 | ||||
-rw-r--r-- | ssl/Makefile.am | 1 | ||||
-rw-r--r-- | tls/Makefile.am | 1 | ||||
-rwxr-xr-x | update.sh | 7 |
5 files changed, 0 insertions, 34 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 1b5198f..c56eda0 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -9,7 +9,6 @@ lib_LTLIBRARIES = libcrypto.la | |||
9 | 9 | ||
10 | EXTRA_DIST = VERSION | 10 | EXTRA_DIST = VERSION |
11 | EXTRA_DIST += CMakeLists.txt | 11 | EXTRA_DIST += CMakeLists.txt |
12 | EXTRA_DIST += crypto.def | ||
13 | EXTRA_DIST += crypto.sym | 12 | EXTRA_DIST += crypto.sym |
14 | 13 | ||
15 | # needed for a CMake target | 14 | # needed for a CMake target |
diff --git a/crypto/crypto_win.list b/crypto/crypto_win.list deleted file mode 100644 index 37c02a5..0000000 --- a/crypto/crypto_win.list +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | arc4random_buf | ||
2 | asprintf | ||
3 | explicit_bzero | ||
4 | inet_pton | ||
5 | gettimeofday | ||
6 | posix_close | ||
7 | posix_connect | ||
8 | posix_fgets | ||
9 | posix_fopen | ||
10 | posix_open | ||
11 | posix_read | ||
12 | posix_rename | ||
13 | posix_write | ||
14 | posix_perror | ||
15 | posix_setsockopt | ||
16 | reallocarray | ||
17 | sleep | ||
18 | strcasecmp | ||
19 | strlcat | ||
20 | strlcpy | ||
21 | strndup | ||
22 | timegm | ||
23 | timingsafe_memcmp | ||
24 | vasprintf | ||
diff --git a/ssl/Makefile.am b/ssl/Makefile.am index b210b92..59a4d23 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am | |||
@@ -4,7 +4,6 @@ lib_LTLIBRARIES = libssl.la | |||
4 | 4 | ||
5 | EXTRA_DIST = VERSION | 5 | EXTRA_DIST = VERSION |
6 | EXTRA_DIST += CMakeLists.txt | 6 | EXTRA_DIST += CMakeLists.txt |
7 | EXTRA_DIST += ssl.def | ||
8 | EXTRA_DIST += ssl.sym | 7 | EXTRA_DIST += ssl.sym |
9 | 8 | ||
10 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym | 9 | libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym |
diff --git a/tls/Makefile.am b/tls/Makefile.am index 3212dfd..b6fdd58 100644 --- a/tls/Makefile.am +++ b/tls/Makefile.am | |||
@@ -4,7 +4,6 @@ lib_LTLIBRARIES = libtls.la | |||
4 | 4 | ||
5 | EXTRA_DIST = VERSION | 5 | EXTRA_DIST = VERSION |
6 | EXTRA_DIST += CMakeLists.txt | 6 | EXTRA_DIST += CMakeLists.txt |
7 | EXTRA_DIST += tls.def | ||
8 | EXTRA_DIST += tls.sym | 7 | EXTRA_DIST += tls.sym |
9 | 8 | ||
10 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym | 9 | libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym |
@@ -148,9 +148,6 @@ $CP crypto/compat/b_win.c crypto/bio | |||
148 | $CP crypto/compat/ui_openssl_win.c crypto/ui | 148 | $CP crypto/compat/ui_openssl_win.c crypto/ui |
149 | # add the libcrypto symbol export list | 149 | # add the libcrypto symbol export list |
150 | grep '^[[:alpha:]]' < $libcrypto_src/Symbols.list > crypto/crypto.sym | 150 | grep '^[[:alpha:]]' < $libcrypto_src/Symbols.list > crypto/crypto.sym |
151 | echo EXPORTS > crypto/crypto.def | ||
152 | grep -v BIO_s_log crypto/crypto.sym >> crypto/crypto.def | ||
153 | cat crypto/crypto_win.list >> crypto/crypto.def | ||
154 | 151 | ||
155 | # generate assembly crypto algorithms | 152 | # generate assembly crypto algorithms |
156 | asm_src=$libcrypto_src | 153 | asm_src=$libcrypto_src |
@@ -206,8 +203,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | |||
206 | done | 203 | done |
207 | # add the libtls symbol export list | 204 | # add the libtls symbol export list |
208 | grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym | 205 | grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym |
209 | echo EXPORTS > tls/tls.def | ||
210 | cat tls/tls.sym >> tls/tls.def | ||
211 | 206 | ||
212 | $CP_LIBC $libc_src/string/strsep.c tls | 207 | $CP_LIBC $libc_src/string/strsep.c tls |
213 | $CP_LIBC $libc_src/string/strsep.c libtls-standalone/compat | 208 | $CP_LIBC $libc_src/string/strsep.c libtls-standalone/compat |
@@ -251,8 +246,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do | |||
251 | done | 246 | done |
252 | # add the libssl symbol export list | 247 | # add the libssl symbol export list |
253 | grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym | 248 | grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym |
254 | echo EXPORTS > ssl/ssl.def | ||
255 | cat ssl/ssl.sym >> ssl/ssl.def | ||
256 | 249 | ||
257 | # copy libcrypto tests | 250 | # copy libcrypto tests |
258 | echo "copying tests" | 251 | echo "copying tests" |