diff options
author | Brent Cook <bcook@openbsd.org> | 2014-12-06 18:59:25 -0600 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2014-12-06 18:59:25 -0600 |
commit | 976f64d932bc5fac8d18dd95feddcfb4f3782551 (patch) | |
tree | 649dc41764f1fdf66e69f24dd53eb978f6181b67 /update.sh | |
parent | 14f4175b67a8cd6c01955340b4e20d75e4e25708 (diff) | |
download | portable-976f64d932bc5fac8d18dd95feddcfb4f3782551.tar.gz portable-976f64d932bc5fac8d18dd95feddcfb4f3782551.tar.bz2 portable-976f64d932bc5fac8d18dd95feddcfb4f3782551.zip |
read all library versions directly from files
This makes building and testing easier because the library Makefile.am
files are use directly rather than as templates. Thanks to Wouter Clarie
for the idea.
Diffstat (limited to 'update.sh')
-rwxr-xr-x | update.sh | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -31,14 +31,17 @@ openssl_app_src=$dir/openbsd/src/usr.bin/openssl | |||
31 | source $libcrypto_src/crypto/shlib_version | 31 | source $libcrypto_src/crypto/shlib_version |
32 | libcrypto_version=$major:$minor:0 | 32 | libcrypto_version=$major:$minor:0 |
33 | echo "libcrypto version $libcrypto_version" | 33 | echo "libcrypto version $libcrypto_version" |
34 | echo $libcrypto_version > crypto/VERSION | ||
34 | 35 | ||
35 | source $libssl_src/ssl/shlib_version | 36 | source $libssl_src/ssl/shlib_version |
36 | libssl_version=$major:$minor:0 | 37 | libssl_version=$major:$minor:0 |
37 | echo "libssl version $libssl_version" | 38 | echo "libssl version $libssl_version" |
39 | echo $libssl_version > ssl/VERSION | ||
38 | 40 | ||
39 | source $libtls_src/shlib_version | 41 | source $libtls_src/shlib_version |
40 | libtls_version=$major:$minor:0 | 42 | libtls_version=$major:$minor:0 |
41 | echo "libtls version $libtls_version" | 43 | echo "libtls version $libtls_version" |
44 | echo $libtls_version > tls/VERSION | ||
42 | 45 | ||
43 | CP='cp -p' | 46 | CP='cp -p' |
44 | 47 | ||
@@ -91,8 +94,6 @@ copy_hdrs ssl "srtp.h ssl.h ssl2.h ssl3.h ssl23.h tls1.h dtls1.h" | |||
91 | 94 | ||
92 | # copy libcrypto source | 95 | # copy libcrypto source |
93 | rm -f crypto/*.c crypto/*.h | 96 | rm -f crypto/*.c crypto/*.h |
94 | sed -e "s/libcrypto-version/${libcrypto_version}/" \ | ||
95 | crypto/Makefile.am.tpl > crypto/Makefile.am | ||
96 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do | 97 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' crypto/Makefile.am` ; do |
97 | dir=`dirname $i` | 98 | dir=`dirname $i` |
98 | mkdir -p crypto/$dir | 99 | mkdir -p crypto/$dir |
@@ -107,7 +108,6 @@ $CP crypto/compat/ui_openssl_win.c crypto/ui | |||
107 | 108 | ||
108 | # copy libtls source | 109 | # copy libtls source |
109 | rm -f tls/*.c tls/*.h | 110 | rm -f tls/*.c tls/*.h |
110 | sed -e "s/libtls-version/${libtls_version}/" tls/Makefile.am.tpl > tls/Makefile.am | ||
111 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do | 111 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do |
112 | cp $libtls_src/$i tls | 112 | cp $libtls_src/$i tls |
113 | done | 113 | done |
@@ -123,7 +123,6 @@ done | |||
123 | 123 | ||
124 | # copy libssl source | 124 | # copy libssl source |
125 | rm -f ssl/*.c ssl/*.h | 125 | rm -f ssl/*.c ssl/*.h |
126 | sed -e "s/libssl-version/${libssl_version}/" ssl/Makefile.am.tpl > ssl/Makefile.am | ||
127 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do | 126 | for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do |
128 | cp $libssl_src/src/ssl/$i ssl | 127 | cp $libssl_src/src/ssl/$i ssl |
129 | done | 128 | done |