generic-library/libreSSL
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build strtonum directly into apps/openssl

Browse Source 
it is not needed as a library export

ok beck@
This commit is contained in:
Brent Cook 2014-07-11 04:47:03 -05:00
parent 84e11fe89d
commit 8b125f31bb
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/Makefile.am.tpl
View File

@ -9,3 +9,7 @@ openssl_LDADD += $(top_builddir)/ssl/libssl.la
openssl_SOURCES = openssl_SOURCES =
noinst_HEADERS = noinst_HEADERS =
if NO_STRTONUM
openssl_SOURCES += strtonum.c
endif

3
crypto/Makefile.am.tpl
View File

@ -60,9 +60,6 @@ endif
if NO_ISSETUGID if NO_ISSETUGID
libcompat_la_SOURCES += compat/issetugid_linux.c libcompat_la_SOURCES += compat/issetugid_linux.c
endif endif
if NO_STRTONUM
libcompat_la_SOURCES += compat/strtonum.c
endif
noinst_HEADERS = des/ncbc_enc.c noinst_HEADERS = des/ncbc_enc.c
noinst_HEADERS += compat/thread_private.h noinst_HEADERS += compat/thread_private.h

8
update.sh
View File

@ -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 cp $libc_src/string/$i crypto/compat
done done
cp $libc_src/stdlib/reallocarray.c crypto/compat 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/arc4random.c crypto/compat
cp $libc_src/crypt/chacha_private.h crypto/compat cp $libc_src/crypt/chacha_private.h crypto/compat
cp $libcrypto_src/crypto/getentropy_*.c crypto/compat cp $libcrypto_src/crypto/getentropy_*.c crypto/compat
@ -374,10 +373,17 @@ crypto_excludes=(
done done
) )
# conditional compiles
cp $libc_src/stdlib/strtonum.c apps/
apps_excludes=(
strtonum.c
)
(cd apps (cd apps
cp Makefile.am.tpl Makefile.am cp Makefile.am.tpl Makefile.am
for i in `ls -1 *.c|sort`; do for i in `ls -1 *.c|sort`; do
if ! [[ ${apps_excludes[*]} =~ $i ]]; then
echo "openssl_SOURCES += $i" >> Makefile.am echo "openssl_SOURCES += $i" >> Makefile.am
fi
done done
for i in `ls -1 *.h|sort`; do for i in `ls -1 *.h|sort`; do
echo "noinst_HEADERS += $i" >> Makefile.am echo "noinst_HEADERS += $i" >> Makefile.am