Index: head/lang/hermes/Makefile =================================================================== --- head/lang/hermes/Makefile (revision 558253) +++ head/lang/hermes/Makefile (revision 558254) @@ -1,42 +1,43 @@ # $FreeBSD$ PORTNAME= hermes DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 -PORTREVISION= 1 +DISTVERSION= 0.7.2.20201216 CATEGORIES= lang PKGNAMESUFFIX= -javascript-engine MAINTAINER= yuri@FreeBSD.org COMMENT= JavaScript engine LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= https://github.com/facebook/hermes/issues/356 LIB_DEPENDS= libicui18n.so:devel/icu TEST_DEPENDS= zip:archivers/zip USES= cmake compiler:c++11-lang python:test +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= facebook -USE_LDCONFIG= yes +GH_TAGNAME= d8b83099 CMAKE_OFF= HERMES_ENABLE_TEST_SUITE BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1201518 BROKEN= needs pthread_getname_np from OSVERSION 1201518 or above .endif do-test: # some tests are known to fail: https://github.com/facebook/hermes/issues/347 @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHERMES_ENABLE_TEST_SUITE:BOOL=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-hermes .include Index: head/lang/hermes/distinfo =================================================================== --- head/lang/hermes/distinfo (revision 558253) +++ head/lang/hermes/distinfo (revision 558254) @@ -1,3 +1,3 @@ -TIMESTAMP = 1600459005 -SHA256 (facebook-hermes-v0.7.0_GH0.tar.gz) = 29019d840f44459d34aa4edf87295333fd215222a8d49735aa55cf9b1849926c -SIZE (facebook-hermes-v0.7.0_GH0.tar.gz) = 7068167 +TIMESTAMP = 1608175014 +SHA256 (facebook-hermes-v0.7.2.20201216-d8b83099_GH0.tar.gz) = 14bcfa037a046a3a0499a9b7f06c99676cef3f0557295d3877f6b631ecbb9d46 +SIZE (facebook-hermes-v0.7.2.20201216-d8b83099_GH0.tar.gz) = 7739419 Index: head/lang/hermes/files/patch-external_llvh_CMakeLists.txt =================================================================== --- head/lang/hermes/files/patch-external_llvh_CMakeLists.txt (nonexistent) +++ head/lang/hermes/files/patch-external_llvh_CMakeLists.txt (revision 558254) @@ -0,0 +1,10 @@ +Workaround for gtest-related breakage: https://github.com/facebook/hermes/issues/388 + +--- external/llvh/CMakeLists.txt.orig 2020-12-17 03:26:48 UTC ++++ external/llvh/CMakeLists.txt +@@ -27,4 +27,4 @@ add_subdirectory(lib) + add_subdirectory(utils/FileCheck) + add_subdirectory(utils/not) + add_subdirectory(utils/count) +-add_subdirectory(utils/unittest) ++#add_subdirectory(utils/unittest) Property changes on: head/lang/hermes/files/patch-external_llvh_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/hermes/files/patch-lib_Support_OSCompatPosix.cpp =================================================================== --- head/lang/hermes/files/patch-lib_Support_OSCompatPosix.cpp (revision 558253) +++ head/lang/hermes/files/patch-lib_Support_OSCompatPosix.cpp (revision 558254) @@ -1,54 +1,54 @@ ---- lib/Support/OSCompatPosix.cpp.orig 2020-08-03 19:19:06 UTC +--- lib/Support/OSCompatPosix.cpp.orig 2020-12-17 02:21:13 UTC +++ lib/Support/OSCompatPosix.cpp -@@ -23,6 +23,11 @@ +@@ -25,6 +25,11 @@ #endif #endif // __linux__ +#if defined(__FreeBSD__) +#include +#include +#endif + #include #include -@@ -213,7 +218,7 @@ void vm_unused(void *p, size_t sz) { +@@ -228,7 +233,7 @@ void vm_unused(void *p, size_t sz) { /// the process's physical footprint. #define MADV_UNUSED MADV_FREE -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) /// On linux, telling the OS that we \p MADV_DONTNEED some pages will cause it /// to immediately deduct their size from the process's resident set. -@@ -414,6 +419,12 @@ uint64_t thread_id() { +@@ -554,6 +559,12 @@ uint64_t thread_id() { return syscall(__NR_gettid); } +#elif defined(__FreeBSD__) + +uint64_t thread_id() { + return reinterpret_cast(pthread_self()); +} + #else #error "Thread ID not supported on this platform" #endif -@@ -443,7 +454,7 @@ std::chrono::microseconds thread_cpu_time() { +@@ -595,7 +606,7 @@ std::chrono::microseconds thread_cpu_time() { return microseconds(total); } -#elif defined(__linux__) // !(__APPLE__ && __MACH__) +#elif defined(__linux__) || defined(__FreeBSD__) // !(__APPLE__ && __MACH__) std::chrono::microseconds thread_cpu_time() { using namespace std::chrono; -@@ -480,7 +491,7 @@ bool thread_page_fault_count(int64_t *outMinorFaults, +@@ -632,7 +643,7 @@ bool thread_page_fault_count(int64_t *outMinorFaults, return kr == KERN_SUCCESS; } -#elif defined(__linux__) // !(__APPLE__ && __MACH__) +#elif defined(__linux__) || defined(__FreeBSD__) // !(__APPLE__ && __MACH__) bool thread_page_fault_count(int64_t *outMinorFaults, int64_t *outMajorFaults) { struct rusage stats = {};