aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2017-07-08 19:05:35 -0500
committerBrent Cook <bcook@openbsd.org>2017-07-08 19:05:35 -0500
commite5505342036183ff32a8f537be1a5105d6a1dbaa (patch)
treeb4e457693eaf68381095e47794a638ac2a7e57a4
parent9b88fa46bb727d811d95f7696d91cbc07278f65e (diff)
downloadportable-e5505342036183ff32a8f537be1a5105d6a1dbaa.tar.gz
portable-e5505342036183ff32a8f537be1a5105d6a1dbaa.tar.bz2
portable-e5505342036183ff32a8f537be1a5105d6a1dbaa.zip
make it easier to swap grep (Solaris grep doesn't support alpha)
-rwxr-xr-xupdate.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/update.sh b/update.sh
index 90dbde6..ec69dfc 100755
--- a/update.sh
+++ b/update.sh
@@ -63,6 +63,10 @@ do_cp_libc() {
63CP_LIBC='do_cp_libc' 63CP_LIBC='do_cp_libc'
64 64
65CP='cp -p' 65CP='cp -p'
66GREP='grep'
67if [ -x /opt/csw/bin/ggrep ]; then
68 GREP='/opt/csw/bin/ggrep'
69fi
66 70
67$CP $libssl_src/LICENSE COPYING 71$CP $libssl_src/LICENSE COPYING
68 72
@@ -152,7 +156,7 @@ done
152$CP crypto/compat/b_win.c crypto/bio 156$CP crypto/compat/b_win.c crypto/bio
153$CP crypto/compat/ui_openssl_win.c crypto/ui 157$CP crypto/compat/ui_openssl_win.c crypto/ui
154# add the libcrypto symbol export list 158# add the libcrypto symbol export list
155grep -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | grep '^[[:alpha:]]' > crypto/crypto.sym 159$GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[[:alpha:]]' > crypto/crypto.sym
156 160
157# generate assembly crypto algorithms 161# generate assembly crypto algorithms
158asm_src=$libcrypto_src 162asm_src=$libcrypto_src
@@ -207,7 +211,7 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' tls/Makefile.am` ; do
207 fi 211 fi
208done 212done
209# add the libtls symbol export list 213# add the libtls symbol export list
210grep '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym 214$GREP '^[[:alpha:]]' < $libtls_src/Symbols.list > tls/tls.sym
211 215
212mkdir -p libtls-standalone/m4 216mkdir -p libtls-standalone/m4
213$CP m4/check*.m4 \ 217$CP m4/check*.m4 \
@@ -260,7 +264,7 @@ for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
260 $CP $libssl_src/$i ssl 264 $CP $libssl_src/$i ssl
261done 265done
262# add the libssl symbol export list 266# add the libssl symbol export list
263grep '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym 267$GREP '^[[:alpha:]]' < $libssl_src/Symbols.list > ssl/ssl.sym
264 268
265# copy libcrypto tests 269# copy libcrypto tests
266echo "copying tests" 270echo "copying tests"
@@ -305,7 +309,7 @@ add_man_links() {
305 filter=$1 309 filter=$1
306 dest=$2 310 dest=$2
307 echo "install-data-hook:" >> $dest 311 echo "install-data-hook:" >> $dest
308 for i in `grep $filter man/links`; do 312 for i in `$GREP $filter man/links`; do
309 IFS=","; set $i; unset IFS 313 IFS=","; set $i; unset IFS
310 if [ "$2" != "" ]; then 314 if [ "$2" != "" ]; then
311 echo " ln -sf \"$1\" \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest 315 echo " ln -sf \"$1\" \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest
@@ -313,7 +317,7 @@ add_man_links() {
313 done 317 done
314 echo "" >> $dest 318 echo "" >> $dest
315 echo "uninstall-local:" >> $dest 319 echo "uninstall-local:" >> $dest
316 for i in `grep $filter man/links`; do 320 for i in `$GREP $filter man/links`; do
317 IFS=","; set $i; unset IFS 321 IFS=","; set $i; unset IFS
318 if [ "$2" != "" ]; then 322 if [ "$2" != "" ]; then
319 echo " -rm -f \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest 323 echo " -rm -f \"\$(DESTDIR)\$(mandir)/man3/$2\"" >> $dest