From 839559e1f9cb2dce3e1ca41aa067a77edaef592e Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Mon, 3 Apr 2017 13:28:00 +0100 Subject: [PATCH] Fix build on Ubuntu 12.04 caused by old GCC Former-commit-id: f32c21cd6377dda04a36f6cf3e8d91db15e54212 --- ...itionally_define_alignas_for_precise.patch | 33 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 34 insertions(+) create mode 100644 debian/patches/conditionally_define_alignas_for_precise.patch create mode 100644 debian/patches/series diff --git a/debian/patches/conditionally_define_alignas_for_precise.patch b/debian/patches/conditionally_define_alignas_for_precise.patch new file mode 100644 index 0000000000..184e37528e --- /dev/null +++ b/debian/patches/conditionally_define_alignas_for_precise.patch @@ -0,0 +1,33 @@ +diff --git a/external/boringssl/crypto/internal.h b/external/boringssl/crypto/internal.h +index e35fb7b..7bc1bea 100644 +--- a/external/boringssl/crypto/internal.h ++++ b/external/boringssl/crypto/internal.h +@@ -117,6 +117,8 @@ + #define alignas(x) __declspec(align(x)) + #define alignof __alignof + #endif ++#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ <= 406) ++#define alignas(x) __attribute((aligned(x))) + #else + #include + #endif +diff --git a/configure.ac b/configure.ac +index a04424a..e67ce89 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2994,7 +2994,6 @@ case "$host" in + AOT_SUPPORTED="yes" + BTLS_SUPPORTED=yes + BTLS_PLATFORM=i386 +- AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) + ;; + darwin*) + AOT_SUPPORTED="yes" +@@ -3017,7 +3016,6 @@ case "$host" in + AOT_SUPPORTED="yes" + BTLS_SUPPORTED=yes + BTLS_PLATFORM=x86_64 +- AC_CHECK_HEADER(stdalign.h,[],[BTLS_SUPPORTED=no]) + ;; + darwin*) + AOT_SUPPORTED="yes" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000000..0a22ab92dc --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +conditionally_define_alignas_for_precise.patch