diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-13 12:43:42 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-13 17:18:24 +0300 |
| commit | e02c17ee702e4c14663daa01c36d7e7e298a2160 (patch) | |
| tree | 9900ffe778afcaf23c57eb2948c4a076aeff1c8f | |
| parent | 1c32c46f14347d479e13c5799451037753fdb679 (diff) | |
| download | gnutls-e02c17ee702e4c14663daa01c36d7e7e298a2160.tar.gz | |
import-chacha: fix several additional symbol clashes
Fix sed script used to rename symbols to remove few additional symbols
sitting in _nettle_FOO namespace.
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
| -rwxr-xr-x | devel/import-chacha-from-nettle.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/devel/import-chacha-from-nettle.sh b/devel/import-chacha-from-nettle.sh index c79f8b8c32..bd570b8b25 100755 --- a/devel/import-chacha-from-nettle.sh +++ b/devel/import-chacha-from-nettle.sh @@ -72,7 +72,9 @@ for f in $IMPORTS; do *.h) # Add prefix to function symbols avoid clashing with the public ones. sed -e 's/^#define \(.*\) nettle_\1/#define \1 gnutls_nettle_chacha_\1/' \ - -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_chacha_\1/' $dst > $dst-t && \ + -e 's/^#define _\(.*\) _nettle_\1/#define _\1 _gnutls_nettle_chacha_\1/' \ + -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_chacha_\1/' \ + $dst > $dst-t && \ mv $dst-t $dst ;; esac |