@@ -49,7 +49,7 @@ SRCROOT="${TMPDIR}/src/boringssl.googlesource.com/boringssl"
49
49
# and BoringSSL.
50
50
function namespace_inlines {
51
51
# Pull out all STACK_OF functions.
52
- STACKS=$( grep --no-filename -rE -e " DEFINE_(SPECIAL_)?STACK_OF\([A-Z_0-9a-z]+\)" -e " DEFINE_NAMED_STACK_OF\([A-Z_0-9a-z]+, +[A-Z_0-9a-z:]+\)" " $1 /" * | grep -v ' //' | grep -v ' #' | gsed -e ' s/DEFINE_\(SPECIAL_\)\?STACK_OF(\(.*\))/\2/' -e ' s/DEFINE_NAMED_STACK_OF(\(.*\), .*)/\1/' )
52
+ STACKS=$( grep --no-filename -rE -e " DEFINE_(SPECIAL_)?STACK_OF\([A-Z_0-9a-z]+\)" -e " DEFINE_NAMED_STACK_OF\([A-Z_0-9a-z]+, +[A-Z_0-9a-z:]+\)" " $1 /" * | grep -v ' //' | grep -v ' #' | $sed -e ' s/DEFINE_\(SPECIAL_\)\?STACK_OF(\(.*\))/\2/' -e ' s/DEFINE_NAMED_STACK_OF(\(.*\), .*)/\1/' )
53
53
STACK_FUNCTIONS=(" call_free_func" " call_copy_func" " call_cmp_func" " new" " new_null" " num" " zero" " value" " set" " free" " pop_free" " insert" " delete" " delete_ptr" " find" " shift" " push" " pop" " dup" " sort" " is_sorted" " set_cmp_func" " deep_copy" " delete_if" )
54
54
55
55
for s in $STACKS ; do
@@ -59,7 +59,7 @@ function namespace_inlines {
59
59
done
60
60
61
61
# Now pull out all LHASH_OF functions.
62
- LHASHES=$( grep --no-filename -rE " DEFINE_LHASH_OF\([A-Z_0-9a-z]+\)" " $1 /" * | grep -v ' //' | grep -v ' #' | grep -v ' \\$' | gsed ' s/DEFINE_LHASH_OF(\(.*\))/\1/' )
62
+ LHASHES=$( grep --no-filename -rE " DEFINE_LHASH_OF\([A-Z_0-9a-z]+\)" " $1 /" * | grep -v ' //' | grep -v ' #' | grep -v ' \\$' | $sed ' s/DEFINE_LHASH_OF(\(.*\))/\1/' )
63
63
LHASH_FUNCTIONS=(" call_cmp_func" " call_hash_func" " new" " free" " num_items" " retrieve" " call_cmp_key" " retrieve_key" " insert" " delete" " call_doall" " call_doall_arg" " doall" " doall_arg" )
64
64
65
65
for l in $LHASHES ; do
@@ -246,7 +246,7 @@ echo "DISABLING assembly on x86 Windows"
246
246
# x86 Windows builds require nasm for acceleration. SwiftPM can't do that right now,
247
247
# so we disable the assembly.
248
248
cd " $DSTROOT "
249
- gsed -i " /#define OPENSSL_HEADER_BASE_H/a#if defined(_WIN32) && (defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || defined(__x86) || defined(__i386) || defined(__i386__) || defined(_M_IX86))\n#define OPENSSL_NO_ASM\n#endif" " include/openssl/base.h"
249
+ $sed -i " /#define OPENSSL_HEADER_BASE_H/a#if defined(_WIN32) && (defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || defined(__x86) || defined(__i386) || defined(__i386__) || defined(_M_IX86))\n#define OPENSSL_NO_ASM\n#endif" " include/openssl/base.h"
250
250
251
251
)
252
252
0 commit comments