From 8b125f31bb733c1707e6e6aaf699c0ef39fea8ec Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 11 Jul 2014 04:47:03 -0500 Subject: build strtonum directly into apps/openssl it is not needed as a library export ok beck@ --- apps/Makefile.am.tpl | 4 ++++ crypto/Makefile.am.tpl | 3 --- 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 openssl_SOURCES = noinst_HEADERS = + +if NO_STRTONUM +openssl_SOURCES += strtonum.c +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 if NO_ISSETUGID libcompat_la_SOURCES += compat/issetugid_linux.c endif -if NO_STRTONUM -libcompat_la_SOURCES += compat/strtonum.c -endif noinst_HEADERS = des/ncbc_enc.c noinst_HEADERS += compat/thread_private.h diff --git a/update.sh b/update.sh index 3fc5d07..3fa94f0 100755 --- a/update.sh +++ b/update.sh @@ -63,7 +63,6 @@ for i in explicit_bzero.c strlcpy.c strlcat.c timingsafe_bcmp.c timingsafe_memcm cp $libc_src/string/$i crypto/compat done cp $libc_src/stdlib/reallocarray.c crypto/compat -cp $libc_src/stdlib/strtonum.c crypto/compat cp $libc_src/crypt/arc4random.c crypto/compat cp $libc_src/crypt/chacha_private.h crypto/compat cp $libcrypto_src/crypto/getentropy_*.c crypto/compat @@ -374,10 +373,17 @@ crypto_excludes=( done ) +# conditional compiles +cp $libc_src/stdlib/strtonum.c apps/ +apps_excludes=( + strtonum.c + ) (cd apps cp Makefile.am.tpl Makefile.am for i in `ls -1 *.c|sort`; do - echo "openssl_SOURCES += $i" >> Makefile.am + if ! [[ ${apps_excludes[*]} =~ $i ]]; then + echo "openssl_SOURCES += $i" >> Makefile.am + fi done for i in `ls -1 *.h|sort`; do echo "noinst_HEADERS += $i" >> Makefile.am -- cgit v1.2.3-55-g6feb