From 29694e6a5ba4d4d8deb7533a1d948282823d2944 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 7 Jun 2017 14:48:16 +0100 Subject: [PATCH] Remove obsolete (I hope) patch Former-commit-id: fe566999dd5bd07d5ad17372bba7524e0e25857b --- ...itionally_define_alignas_for_precise.patch | 64 ------------------- debian/patches/series | 1 - 2 files changed, 65 deletions(-) delete mode 100644 debian/patches/conditionally_define_alignas_for_precise.patch delete 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 deleted file mode 100644 index ef0963e278..0000000000 --- a/debian/patches/conditionally_define_alignas_for_precise.patch +++ /dev/null @@ -1,64 +0,0 @@ -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/external/boringssl/CMakeLists.txt b/external/boringssl/CMakeLists.txt -index 4e63c89..8875b10 100644 ---- a/external/boringssl/CMakeLists.txt -+++ b/external/boringssl/CMakeLists.txt -@@ -32,7 +32,11 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - if(ANDROID) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ${C_CXX_FLAGS}") - elseif(CMAKE_COMPILER_IS_GNUCXX) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${C_CXX_FLAGS}") -+ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.6.99") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${C_CXX_FLAGS}") -+ else() -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x ${C_CXX_FLAGS}") -+ endif() - else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ ${C_CXX_FLAGS}") - endif() -diff --git a/external/boringssl/CMakeLists.txt b/external/boringssl/CMakeLists.txt -index 4e63c89..296d010 100644 ---- a/external/boringssl/CMakeLists.txt -+++ b/external/boringssl/CMakeLists.txt -@@ -198,7 +198,9 @@ add_subdirectory(ssl) - if(ENABLE_TESTS) - add_subdirectory(ssl/test) - endif() -+if(ENABLE_TOOL) - add_subdirectory(tool) -+endif() - if(ENABLE_DECREPIT) - add_subdirectory(decrepit) - endif() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 0a22ab92dc..0000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -conditionally_define_alignas_for_precise.patch