diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-07-11 04:47:03 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-07-11 04:47:03 -0500 |
| commit | 8b125f31bb733c1707e6e6aaf699c0ef39fea8ec (patch) | |
| tree | 295acaed00bba1c7da3f64adfea89a5c96eac411 | |
| parent | 84e11fe89df5a272eb815b204d5be70fc3805b7c (diff) | |
| download | portable-8b125f31bb733c1707e6e6aaf699c0ef39fea8ec.tar.gz portable-8b125f31bb733c1707e6e6aaf699c0ef39fea8ec.tar.bz2 portable-8b125f31bb733c1707e6e6aaf699c0ef39fea8ec.zip | |
build strtonum directly into apps/openssl
it is not needed as a library export
ok beck@
| -rw-r--r-- | apps/Makefile.am.tpl | 4 | ||||
| -rw-r--r-- | crypto/Makefile.am.tpl | 3 | ||||
| -rwxr-xr-x | update.sh | 10 |
3 files changed, 12 insertions, 5 deletions
diff --git a/apps/Makefile.am.tpl b/apps/Makefile.am.tpl index ea6174d..7222c18 100644 --- a/apps/Makefile.am.tpl +++ b/apps/Makefile.am.tpl | |||
| @@ -9,3 +9,7 @@ openssl_LDADD += $(top_builddir)/ssl/libssl.la | |||
| 9 | 9 | ||
| 10 | openssl_SOURCES = | 10 | openssl_SOURCES = |
| 11 | noinst_HEADERS = | 11 | noinst_HEADERS = |
| 12 | |||
| 13 | if NO_STRTONUM | ||
| 14 | openssl_SOURCES += strtonum.c | ||
| 15 | endif | ||
diff --git a/crypto/Makefile.am.tpl b/crypto/Makefile.am.tpl index 1aa8e8b..4830da4 100644 --- a/crypto/Makefile.am.tpl +++ b/crypto/Makefile.am.tpl | |||
| @@ -60,9 +60,6 @@ endif | |||
| 60 | if NO_ISSETUGID | 60 | if NO_ISSETUGID |
| 61 | libcompat_la_SOURCES += compat/issetugid_linux.c | 61 | libcompat_la_SOURCES += compat/issetugid_linux.c |
| 62 | endif | 62 | endif |
| 63 | if NO_STRTONUM | ||
| 64 | libcompat_la_SOURCES += compat/strtonum.c | ||
| 65 | endif | ||
| 66 | 63 | ||
| 67 | noinst_HEADERS = des/ncbc_enc.c | 64 | noinst_HEADERS = des/ncbc_enc.c |
| 68 | noinst_HEADERS += compat/thread_private.h | 65 | noinst_HEADERS += compat/thread_private.h |
| @@ -63,7 +63,6 @@ for i in explicit_bzero.c strlcpy.c strlcat.c timingsafe_bcmp.c timingsafe_memcm | |||
| 63 | cp $libc_src/string/$i crypto/compat | 63 | cp $libc_src/string/$i crypto/compat |
| 64 | done | 64 | done |
| 65 | cp $libc_src/stdlib/reallocarray.c crypto/compat | 65 | cp $libc_src/stdlib/reallocarray.c crypto/compat |
| 66 | cp $libc_src/stdlib/strtonum.c crypto/compat | ||
| 67 | cp $libc_src/crypt/arc4random.c crypto/compat | 66 | cp $libc_src/crypt/arc4random.c crypto/compat |
| 68 | cp $libc_src/crypt/chacha_private.h crypto/compat | 67 | cp $libc_src/crypt/chacha_private.h crypto/compat |
| 69 | cp $libcrypto_src/crypto/getentropy_*.c crypto/compat | 68 | cp $libcrypto_src/crypto/getentropy_*.c crypto/compat |
| @@ -374,10 +373,17 @@ crypto_excludes=( | |||
| 374 | done | 373 | done |
| 375 | ) | 374 | ) |
| 376 | 375 | ||
| 376 | # conditional compiles | ||
| 377 | cp $libc_src/stdlib/strtonum.c apps/ | ||
| 378 | apps_excludes=( | ||
| 379 | strtonum.c | ||
| 380 | ) | ||
| 377 | (cd apps | 381 | (cd apps |
| 378 | cp Makefile.am.tpl Makefile.am | 382 | cp Makefile.am.tpl Makefile.am |
| 379 | for i in `ls -1 *.c|sort`; do | 383 | for i in `ls -1 *.c|sort`; do |
| 380 | echo "openssl_SOURCES += $i" >> Makefile.am | 384 | if ! [[ ${apps_excludes[*]} =~ $i ]]; then |
| 385 | echo "openssl_SOURCES += $i" >> Makefile.am | ||
| 386 | fi | ||
| 381 | done | 387 | done |
| 382 | for i in `ls -1 *.h|sort`; do | 388 | for i in `ls -1 *.h|sort`; do |
| 383 | echo "noinst_HEADERS += $i" >> Makefile.am | 389 | echo "noinst_HEADERS += $i" >> Makefile.am |