Index: head/misc/py-xgboost/Makefile =================================================================== --- head/misc/py-xgboost/Makefile (revision 553388) +++ head/misc/py-xgboost/Makefile (revision 553389) @@ -1,46 +1,44 @@ # $FreeBSD$ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT, GBM) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../LICENSE BUILD_DEPENDS= cmake:devel/cmake LIB_DEPENDS= libdmlc.so:devel/dmlc-core \ librabit.so:misc/xgboost RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} USES= python:3.5+ localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= dmlc USE_PYTHON= distutils autoplist USE_LDCONFIG= yes GH_TUPLE= \ - dmlc:rabit:4fb34a008db6437c84d1877635064e09a55c8553:dmlc_rabit/../rabit + dmlc:rabit:4acdd7c6f68debe1c39ae07ca75466d74d194dd1:dmlc_rabit/../rabit WRKSRC_SUBDIR= python-package - -MAKE_ENV+= FREEBSD_LIBRARY_PATH=${LOCALBASE}/lib LDFLAGS+= -lexecinfo POST_PLIST= fix-plist .include .if ${OSVERSION} < 1300060 BROKEN_i386= undefined symbol: __atomic_load (on 11 and 12, but not on 13) .endif fix-plist: # https://github.com/dmlc/xgboost/issues/5705 @${REINPLACE_CMD} 's|/libxgboost.so$$|/xgboost/lib/libxgboost.so|' ${TMPPLIST} .include Index: head/misc/py-xgboost/distinfo =================================================================== --- head/misc/py-xgboost/distinfo (revision 553388) +++ head/misc/py-xgboost/distinfo (revision 553389) @@ -1,5 +1,5 @@ -TIMESTAMP = 1600935150 -SHA256 (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 074ef38f9fff675470c4b461e204cd1c778f984191ca89afdfcc55b46a1868d2 -SIZE (dmlc-xgboost-v1.2.0_GH0.tar.gz) = 1341770 -SHA256 (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 7d9a18b1613dfd3a5244524ecdb164d6b2a1f150d297cc7b8527e221aabb6eb7 -SIZE (dmlc-rabit-4fb34a008db6437c84d1877635064e09a55c8553_GH0.tar.gz) = 93236 +TIMESTAMP = 1603744234 +SHA256 (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 0190b902cdf4e0a05e735a382708e2025f1ff541a53251e43160beb3041bf35b +SIZE (dmlc-xgboost-v1.2.1_GH0.tar.gz) = 1341653 +SHA256 (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 9e8bbdc04e504d7e7c98b9f683be5378cc5394405983d30737a14ca3dd43d449 +SIZE (dmlc-rabit-4acdd7c6f68debe1c39ae07ca75466d74d194dd1_GH0.tar.gz) = 94118 Index: head/misc/py-xgboost/files/patch-CMakeLists.txt =================================================================== --- head/misc/py-xgboost/files/patch-CMakeLists.txt (revision 553388) +++ head/misc/py-xgboost/files/patch-CMakeLists.txt (revision 553389) @@ -1,34 +1,43 @@ --- ../CMakeLists.txt.orig 2020-09-24 08:09:24 UTC +++ ../CMakeLists.txt @@ -131,11 +131,11 @@ add_subdirectory(${xgboost_SOURCE_DIR}/src) # dmlc-core msvc_use_static_runtime() -add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) -set_target_properties(dmlc PROPERTIES - CXX_STANDARD 14 - CXX_STANDARD_REQUIRED ON - POSITION_INDEPENDENT_CODE ON) +#add_subdirectory(${xgboost_SOURCE_DIR}/dmlc-core) +#set_target_properties(dmlc PROPERTIES +# CXX_STANDARD 14 +# CXX_STANDARD_REQUIRED ON +# POSITION_INDEPENDENT_CODE ON) if (MSVC) target_compile_options(dmlc PRIVATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) @@ -144,10 +144,10 @@ if (MSVC) -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE) endif (TARGET dmlc_unit_tests) endif (MSVC) -if (ENABLE_ALL_WARNINGS) - target_compile_options(dmlc PRIVATE -Wall -Wextra) -endif (ENABLE_ALL_WARNINGS) -target_link_libraries(objxgboost PUBLIC dmlc) +#if (ENABLE_ALL_WARNINGS) +# target_compile_options(dmlc PRIVATE -Wall -Wextra) +#endif (ENABLE_ALL_WARNINGS) +#target_link_libraries(objxgboost PUBLIC dmlc) # rabit set(RABIT_BUILD_DMLC OFF) +@@ -202,7 +202,7 @@ + + #-- Hide all C++ symbols + if (HIDE_CXX_SYMBOLS) +- foreach(target objxgboost xgboost dmlc rabit rabit_mock_static) ++ foreach(target objxgboost xgboost rabit rabit_mock_static) + set_target_properties(${target} PROPERTIES CXX_VISIBILITY_PRESET hidden) + endforeach() + endif (HIDE_CXX_SYMBOLS) Index: head/misc/py-xgboost/files/patch-xgboost_libpath.py =================================================================== --- head/misc/py-xgboost/files/patch-xgboost_libpath.py (revision 553388) +++ head/misc/py-xgboost/files/patch-xgboost_libpath.py (revision 553389) @@ -1,11 +1,19 @@ ---- xgboost/libpath.py.orig 2020-05-25 18:09:22 UTC +--- xgboost/libpath.py.orig 2020-10-12 22:10:16 UTC +++ xgboost/libpath.py -@@ -20,6 +20,8 @@ def find_lib_path(): +@@ -4,6 +4,7 @@ + import os + import platform + import sys ++import sysconfig # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0 + + + class XGBoostLibraryNotFound(Exception): +@@ -20,6 +21,8 @@ def find_lib_path(): """ curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__))) dll_path = [ -+ os.getenv('FREEBSD_LIBRARY_PATH'), ++ sysconfig.get_config_var('LIBDIR'), # from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247408#c0 + os.path.join(sys.prefix, 'xgboost'), # normal, after installation `lib` is copied into Python package tree. os.path.join(curr_path, 'lib'), # editable installation, no copying is performed.