From owner-svn-ports-head@freebsd.org Mon Oct 26 21:38:06 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E45B944FBF3; Mon, 26 Oct 2020 21:38:06 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CKp9B5mryz3XYn; Mon, 26 Oct 2020 21:38:06 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A9A9C20C24; Mon, 26 Oct 2020 21:38:06 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09QLc6MC068113; Mon, 26 Oct 2020 21:38:06 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09QLc5ZI068107; Mon, 26 Oct 2020 21:38:05 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202010262138.09QLc5ZI068107@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Mon, 26 Oct 2020 21:38:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553389 - in head/misc/py-xgboost: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc/py-xgboost: . files X-SVN-Commit-Revision: 553389 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2020 21:38:07 -0000 Author: yuri Date: Mon Oct 26 21:38:05 2020 New Revision: 553389 URL: https://svnweb.freebsd.org/changeset/ports/553389 Log: misc/py-xgboost: Update 1.2.0 -> 1.2.1 PR: 247408 MFH: 2020Q4 (fixes py-xgboost failure, see bug#247408) Modified: head/misc/py-xgboost/Makefile head/misc/py-xgboost/distinfo head/misc/py-xgboost/files/patch-CMakeLists.txt head/misc/py-xgboost/files/patch-xgboost_libpath.py Modified: head/misc/py-xgboost/Makefile ============================================================================== --- head/misc/py-xgboost/Makefile Mon Oct 26 21:37:14 2020 (r553388) +++ head/misc/py-xgboost/Makefile Mon Oct 26 21:38:05 2020 (r553389) @@ -2,7 +2,7 @@ PORTNAME= xgboost DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= misc # machine-learning PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -24,11 +24,9 @@ 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 Modified: head/misc/py-xgboost/distinfo ============================================================================== --- head/misc/py-xgboost/distinfo Mon Oct 26 21:37:14 2020 (r553388) +++ head/misc/py-xgboost/distinfo Mon Oct 26 21:38:05 2020 (r553389) @@ -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 Modified: head/misc/py-xgboost/files/patch-CMakeLists.txt ============================================================================== --- head/misc/py-xgboost/files/patch-CMakeLists.txt Mon Oct 26 21:37:14 2020 (r553388) +++ head/misc/py-xgboost/files/patch-CMakeLists.txt Mon Oct 26 21:38:05 2020 (r553389) @@ -32,3 +32,12 @@ # 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) Modified: head/misc/py-xgboost/files/patch-xgboost_libpath.py ============================================================================== --- head/misc/py-xgboost/files/patch-xgboost_libpath.py Mon Oct 26 21:37:14 2020 (r553388) +++ head/misc/py-xgboost/files/patch-xgboost_libpath.py Mon Oct 26 21:38:05 2020 (r553389) @@ -1,10 +1,18 @@ ---- 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'),