diff options
| author | pypi | 2015-08-24 08:01:05 +1200 |
|---|---|---|
| committer | pypi | 2015-08-24 08:01:05 +1200 |
| commit | 6c581d2cb333397c37b40e24b92e375a97d511de (patch) | |
| tree | 3f8c8ed6aa791b11d202a54a6d455f1f588de98b | |
| parent | bd0c701d1a06d44f69a67ed52a8e3acb545cc97b (diff) | |
| download | aur-6c581d2cb333397c37b40e24b92e375a97d511de.tar.gz | |
Added patches for working around build flag hack
| -rw-r--r-- | nacl_posix_source.patch | 23 | ||||
| -rw-r--r-- | posix_macro.patch | 27 |
2 files changed, 50 insertions, 0 deletions
diff --git a/nacl_posix_source.patch b/nacl_posix_source.patch new file mode 100644 index 000000000000..f247d498dd34 --- /dev/null +++ b/nacl_posix_source.patch @@ -0,0 +1,23 @@ +Fix Chromium NaCl build. + +Chromium's NaCl build has _POSIX_SOURCE already defined, so #undef it first. +The compiler used also dislikes static asserts with the same name. + +EDIT: Alastair Hughes: Removed second part of the patch, since it didn't apply. + +Change-Id: I0283fbad1a2ccf98cdb0ca2a7965b15441806308 +Reviewed-on: https://boringssl-review.googlesource.com/5430 +Reviewed-by: Adam Langley <agl@google.com> +diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c +index 481278f..7e677f7 100644 +--- a/crypto/bio/socket_helper.c ++++ b/crypto/bio/socket_helper.c +@@ -12,6 +12,7 @@ + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + ++#undef _POSIX_C_SOURCE + #define _POSIX_C_SOURCE 200112L + + #include <openssl/bio.h> + diff --git a/posix_macro.patch b/posix_macro.patch new file mode 100644 index 000000000000..547872289f10 --- /dev/null +++ b/posix_macro.patch @@ -0,0 +1,27 @@ +Demand for newer POSIX macro + +Reason for change: Define _POSIX_C_SOURCE such that it demands correct +posix interfaces, netdb.h declares interfaces such as +getaddrinfo if __USE_POSIX, i.e. POSIX.1:1990 or later. +However, these interfaces were new in the 2001 edition of POSIX +therefore ask for Extension from POSIX.1:2001 since we use addrinfo +structure here. + +Change-Id: Icb1c92745d1a0ca958108ae80c270c630628729e +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Reviewed-on: https://boringssl-review.googlesource.com/5253 +Reviewed-by: Adam Langley <agl@google.com> +diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c +index b1cdd1a..481278f 100644 +--- a/crypto/bio/socket_helper.c ++++ b/crypto/bio/socket_helper.c +@@ -12,7 +12,7 @@ + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + +-#define _POSIX_SOURCE ++#define _POSIX_C_SOURCE 200112L + + #include <openssl/bio.h> + #include <openssl/err.h> + |