diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-19 07:39:15 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-04-19 07:39:15 +0000 |
| commit | ad088e83abae914f9a592b27136ce063004a7ff8 (patch) | |
| tree | ad8687db41b0d999e0a2d8e6a459bbf907f4f8b4 | |
| parent | 6486b11ac03c979de4199567c50c25b886c1cfd3 (diff) | |
| parent | aa2fc885951fac3304938c9be82cada1454f06ee (diff) | |
| download | gnutls-ad088e83abae914f9a592b27136ce063004a7ff8.tar.gz | |
Merge branch 'tmp-fix-ecc-freebsd' into 'master'
build: attempt to fix build issues on FreeBSD
See merge request gnutls/gnutls!1236
| -rwxr-xr-x | devel/import-ecc-from-nettle.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/devel/import-ecc-from-nettle.sh b/devel/import-ecc-from-nettle.sh index 9ed40f077a..6bfb9d30d8 100755 --- a/devel/import-ecc-from-nettle.sh +++ b/devel/import-ecc-from-nettle.sh @@ -121,9 +121,9 @@ for f in $IMPORTS; do sed -e 's/^#define \(.*\) nettle_\1/#define \1 gnutls_nettle_ecc_\1/' \ -e 's/^#define \(.*\) _nettle_\1/#define \1 _gnutls_nettle_ecc_\1/' \ -e 's/^#define _\(.*\) _nettle_\1/#define _\1 _gnutls_nettle_ecc_\1/' \ - -e 's/^_nettle_\(.*\)(.*/#define _nettle_\1 _gnutls_nettle_ecc_\1\n\0/' \ - -e 's/^extern const struct ecc_curve _nettle_\(.*\);/#define _nettle_\1 _gnutls_nettle_ecc_\1\n\0/' \ - -e 's/^extern const struct ecc_eddsa _nettle_\(.*\);/#define _nettle_\1 _gnutls_nettle_ecc_\1\n\0/' \ + -e '/^_nettle_/ { h ; s/^_nettle_\(.*\)(.*/#define _nettle_\1 _gnutls_nettle_ecc_\1/g ; p; x; }' \ + -e '/^extern const struct ecc_curve _nettle_\(.*\);/ { h ; s/.*_nettle\(.*\);/#define _nettle_\1 _gnutls_nettle_ecc_\1/ ; p; x; }' \ + -e '/^extern const struct ecc_eddsa _nettle_\(.*\);/ { h ; s/.*_nettle\(.*\);/#define _nettle_\1 _gnutls_nettle_ecc_\1/ ; p; x; }' \ -e '/gostdsa_generate_keypair/d' \ $dst > $dst-t && \ mv $dst-t $dst @@ -152,7 +152,7 @@ for f in $IMPORTS; do */ecc-gost-gc256b.c) # The generated file is arch dependent, conditionalize the # inclusion. - sed '/^#include "ecc-gost-gc256b\.h"/ { i\ + sed -e '/^#include "ecc-gost-gc256b\.h"/ { i\ #if defined __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)\ # pragma GCC diagnostic ignored "-Wunused-const-variable"\ #endif\ @@ -164,12 +164,16 @@ for f in $IMPORTS; do #error unsupported configuration\ #endif ; d -}' $dst | sed -e 's/#include "ecc-internal.h"/\0\n#include "ecc-gost-curve.h"/' > $dst-t && mv $dst-t $dst +}' \ + -e '/#include "ecc-internal.h"/ { i\ +#include "ecc-gost-curve.h" +; }' \ + $dst > $dst-t && mv $dst-t $dst ;; */ecc-gost-gc512a.c) # The generated file is arch dependent, conditionalize the # inclusion. - sed '/^#include "ecc-gost-gc512a\.h"/ { i\ + sed -e '/^#include "ecc-gost-gc512a\.h"/ { i\ #if defined __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)\ # pragma GCC diagnostic ignored "-Wunused-const-variable"\ #endif\ @@ -181,7 +185,11 @@ for f in $IMPORTS; do #error unsupported configuration\ #endif ; d -}' $dst | sed -e 's/#include "ecc-internal.h"/\0\n#include "ecc-gost-curve.h"/' > $dst-t && mv $dst-t $dst +}' \ + -e '/#include "ecc-internal.h"/ { i\ +#include "ecc-gost-curve.h" +; }' \ + $dst > $dst-t && mv $dst-t $dst ;; */eddsa-hash.c) # Known to be unnecessary. |