Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Jun 2016 19:01:27 +0000 (UTC)
From:      Matthew Seaman <matthew@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416620 - head/editors/neovim/files
Message-ID:  <201606091901.u59J1RL8003498@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: matthew
Date: Thu Jun  9 19:01:27 2016
New Revision: 416620
URL: https://svnweb.freebsd.org/changeset/ports/416620

Log:
  Fix be64toh() detection on BSDs from upstream
  
  Use patch names as generated by 'make makepatch'
  
  PR:		210054
  Submitted by:	gor@clogic.com.ua

Added:
  head/editors/neovim/files/patch-config__CMakeLists.txt   (contents, props changed)
  head/editors/neovim/files/patch-config__config.h.in   (contents, props changed)
  head/editors/neovim/files/patch-src__nvim__shada.c   (contents, props changed)
Deleted:
  head/editors/neovim/files/patch-config_CMakeLists.txt
  head/editors/neovim/files/patch-src_nvim_shada.c

Added: head/editors/neovim/files/patch-config__CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/neovim/files/patch-config__CMakeLists.txt	Thu Jun  9 19:01:27 2016	(r416620)
@@ -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

Added: head/editors/neovim/files/patch-config__config.h.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/neovim/files/patch-config__config.h.in	Thu Jun  9 19:01:27 2016	(r416620)
@@ -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

Added: head/editors/neovim/files/patch-src__nvim__shada.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/neovim/files/patch-src__nvim__shada.c	Thu Jun  9 19:01:27 2016	(r416620)
@@ -0,0 +1,11 @@
+--- src/nvim/shada.c.orig	2016-06-05 14:13:28 UTC
++++ src/nvim/shada.c
+@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606091901.u59J1RL8003498>