aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2017-01-18 20:37:44 +0900
committerkinichiro <kinichiro.inoguchi@gmail.com>2017-01-18 21:05:43 +0900
commit484feaae9157d8e4d91e81d305b9cd0ff6af0c91 (patch)
tree7cacb2743653c703365d027b388136d29dd82f80
parent3276be122f6c5d3912bbfb266227335b65c9d851 (diff)
downloadportable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.tar.gz
portable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.tar.bz2
portable-484feaae9157d8e4d91e81d305b9cd0ff6af0c91.zip
Stop generating .def files by update.sh
-rw-r--r--crypto/Makefile.am1
-rw-r--r--crypto/crypto_win.list24
-rw-r--r--ssl/Makefile.am1
-rw-r--r--tls/Makefile.am1
-rwxr-xr-xupdate.sh7
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
10EXTRA_DIST = VERSION 10EXTRA_DIST = VERSION
11EXTRA_DIST += CMakeLists.txt 11EXTRA_DIST += CMakeLists.txt
12EXTRA_DIST += crypto.def
13EXTRA_DIST += crypto.sym 12EXTRA_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 @@
1arc4random_buf
2asprintf
3explicit_bzero
4inet_pton
5gettimeofday
6posix_close
7posix_connect
8posix_fgets
9posix_fopen
10posix_open
11posix_read
12posix_rename
13posix_write
14posix_perror
15posix_setsockopt
16reallocarray
17sleep
18strcasecmp
19strlcat
20strlcpy
21strndup
22timegm
23timingsafe_memcmp
24vasprintf
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
5EXTRA_DIST = VERSION 5EXTRA_DIST = VERSION
6EXTRA_DIST += CMakeLists.txt 6EXTRA_DIST += CMakeLists.txt
7EXTRA_DIST += ssl.def
8EXTRA_DIST += ssl.sym 7EXTRA_DIST += ssl.sym
9 8
10libssl_la_LDFLAGS = -version-info @LIBSSL_VERSION@ -no-undefined -export-symbols $(top_srcdir)/ssl/ssl.sym 9libssl_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
5EXTRA_DIST = VERSION 5EXTRA_DIST = VERSION
6EXTRA_DIST += CMakeLists.txt 6EXTRA_DIST += CMakeLists.txt
7EXTRA_DIST += tls.def
8EXTRA_DIST += tls.sym 7EXTRA_DIST += tls.sym
9 8
10libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym 9libtls_la_LDFLAGS = -version-info @LIBTLS_VERSION@ -no-undefined -export-symbols $(top_srcdir)/tls/tls.sym
diff --git a/update.sh b/update.sh
index 335c5af..9a9dd5e 100755
--- a/update.sh
+++ b/update.sh
@@ -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
150grep '^[[:alpha:]]' < $libcrypto_src/Symbols.list > crypto/crypto.sym 150grep '^[[:alpha:]]' < $libcrypto_src/Symbols.list > crypto/crypto.sym
151echo EXPORTS > crypto/crypto.def
152grep -v BIO_s_log crypto/crypto.sym >> crypto/crypto.def
153cat crypto/crypto_win.list >> crypto/crypto.def
154 151
155# generate assembly crypto algorithms 152# generate assembly crypto algorithms
156asm_src=$libcrypto_src 153asm_src=$libcrypto_src
@@ -206,8 +203,6 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
206done 203done
207# add the libtls symbol export list 204# add the libtls symbol export list
208grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym 205grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym
209echo EXPORTS > tls/tls.def
210cat 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
251done 246done
252# add the libssl symbol export list 247# add the libssl symbol export list
253grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym 248grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym
254echo EXPORTS > ssl/ssl.def
255cat ssl/ssl.sym >> ssl/ssl.def
256 249
257# copy libcrypto tests 250# copy libcrypto tests
258echo "copying tests" 251echo "copying tests"