Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Feb 2020 21:43:41 +0000 (UTC)
From:      "Bradley T. Hughes" <bhughes@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r525005 - in head/www/node: . files
Message-ID:  <202002022143.012Lhf3j080882@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bhughes
Date: Sun Feb  2 21:43:40 2020
New Revision: 525005
URL: https://svnweb.freebsd.org/changeset/ports/525005

Log:
  www/node: build on i386
  
  A recent change to V8 changed how mapped shared libraries were
  discovered on FreeBSD, changing from using /proc/self/maps to using
  sysctl with KERN_PROC_VMMAP. Unforcunately, this change fails to build
  on i386 (and probably other 32-bit platforms) due to the use of
  reinterpret_cast to change uint64_t to uintptr_t. This is an invalid
  cast. The uin64_t should be static_cast to uintptr_t for it to work on
  all platforms.
  
  While here, bump the libuv dependency that I missed when upgrading to
  13.6.0
  
  PR:		243798
  Reported by:	Martin Birgmeier <d8zNeCFG@aon.at>
  Reported by:	paul beard <paulbeard@gmail.com>
  Reported by:	pkg-fallout@FreeBSD.org
  Sponsored by:	Miles AS

Modified:
  head/www/node/Makefile
  head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc

Modified: head/www/node/Makefile
==============================================================================
--- head/www/node/Makefile	Sun Feb  2 21:26:08 2020	(r525004)
+++ head/www/node/Makefile	Sun Feb  2 21:43:40 2020	(r525005)
@@ -69,7 +69,7 @@ MAKE_ENV+=	CC.host=${CC} CFLAGS.host="${CFLAGS}" \
 		LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}"
 
 BUILD_DEPENDS+=	c-ares>=1.15.0:dns/c-ares\
-		libuv>=1.34.0:devel/libuv \
+		libuv>=1.34.1:devel/libuv \
 		libnghttp2>=1.40.0:www/libnghttp2
 LIB_DEPENDS+=	libcares.so:dns/c-ares\
 		libuv.so:devel/libuv \

Modified: head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc
==============================================================================
--- head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc	Sun Feb  2 21:26:08 2020	(r525004)
+++ head/www/node/files/patch-deps_v8_src_base_platform_platform-freebsd.cc	Sun Feb  2 21:43:40 2020	(r525005)
@@ -1,9 +1,21 @@
 --- deps/v8/src/base/platform/platform-freebsd.cc.orig	2020-01-07 22:07:49 UTC
 +++ deps/v8/src/base/platform/platform-freebsd.cc
-@@ -94,6 +94,48 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+@@ -81,8 +81,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+             lib_name = std::string(path);
+           }
+           result.push_back(SharedLibraryAddress(
+-              lib_name, reinterpret_cast<uintptr_t>(map->kve_start),
+-              reinterpret_cast<uintptr_t>(map->kve_end)));
++              lib_name, static_cast<uintptr_t>(map->kve_start),
++              static_cast<uintptr_t>(map->kve_end)));
+         }
  
- void OS::SignalCodeMovingGC() {}
+         start += ssize;
+@@ -93,6 +93,48 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+ }
  
+ void OS::SignalCodeMovingGC() {}
++
 +#ifdef __arm__
 +
 +bool OS::ArmUsingHardFloat() {
@@ -45,7 +57,6 @@
 +}
 +
 +#endif // def __arm__
-+
+ 
  void OS::AdjustSchedulingParams() {}
  
- }  // namespace base



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