1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-01 10:59:55 +00:00

Fix be64toh() detection on BSDs from upstream

Use patch names as generated by 'make makepatch'

PR:		210054
Submitted by:	gor@clogic.com.ua
This commit is contained in:
Matthew Seaman 2016-06-09 19:01:27 +00:00
parent 786107e674
commit 2b4ec09e7e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=416620
4 changed files with 38 additions and 13 deletions

View File

@ -1,11 +0,0 @@
--- config/CMakeLists.txt.orig 2016-06-09 12:33:52 UTC
+++ config/CMakeLists.txt
@@ -74,7 +74,7 @@ check_c_source_compiles("
#define _BSD_SOURCE 1
#define _DEFAULT_SOURCE 1
${SI}
- #include <endian.h>
+ #include <sys/endian.h>
#ifndef be64toh
# error No be64toh macros
#endif

View File

@ -0,0 +1,26 @@
--- config/CMakeLists.txt.orig 2016-06-05 14:13:28 UTC
+++ config/CMakeLists.txt
@@ -67,6 +67,14 @@ if(HAVE_LANGINFO_H)
check_symbol_exists(CODESET "langinfo.h" HAVE_NL_LANGINFO_CODESET)
endif()
+check_include_files("endian.h" HAVE_ENDIAN_H)
+check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
+
+set(ENDIAN_INCLUDE_FILE "endian.h")
+if(HAVE_SYS_ENDIAN_H AND NOT HAVE_ENDIAN_H)
+ set(ENDIAN_INCLUDE_FILE "sys/endian.h")
+endif()
+
set(SI "#include <stdint.h>\n")
set(MS "int main(int argc,char**argv)\n{\n uint64_t i=0x0102030405060708ULL;")
set(ME "}")
@@ -74,7 +82,7 @@ check_c_source_compiles("
#define _BSD_SOURCE 1
#define _DEFAULT_SOURCE 1
${SI}
- #include <endian.h>
+ #include <${ENDIAN_INCLUDE_FILE}>
#ifndef be64toh
# error No be64toh macros
#endif

View File

@ -0,0 +1,9 @@
--- config/config.h.in.orig 2016-06-05 14:13:28 UTC
+++ config/config.h.in
@@ -57,5 +57,6 @@
#cmakedefine HAVE_BE64TOH
#cmakedefine ORDER_BIG_ENDIAN
+#define ENDIAN_INCLUDE_FILE <@ENDIAN_INCLUDE_FILE@>
#endif // AUTO_CONFIG_H

View File

@ -1,10 +1,11 @@
--- src/nvim/shada.c.orig 2016-04-25 01:46:34 UTC
--- src/nvim/shada.c.orig 2016-06-05 14:13:28 UTC
+++ src/nvim/shada.c
@@ -46,7 +46,6 @@
@@ -46,7 +46,7 @@
#ifdef HAVE_BE64TOH
# define _BSD_SOURCE 1
# define _DEFAULT_SOURCE 1
-# include <endian.h>
+# include ENDIAN_INCLUDE_FILE
#endif
// Note: when using bufset hash pointers are intentionally casted to uintptr_t