misc/py-xgboost: Update 1.2.1 -> 1.4.1

Reported by:	portscout

3 files changed, 24 insertions, 30 deletions

diff --git a/misc/py-xgboost/files/patch-CMakeLists.txt b/misc/py-xgboost/files/patch-CMakeLists.txt
index 87c993afdabb..d71345f99187 100644
--- a/misc/py-xgboost/files/patch-CMakeLists.txt
+++ b/misc/py-xgboost/files/patch-CMakeLists.txt
@@ -17,27 +17,3 @@
  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)
diff --git a/misc/py-xgboost/files/patch-setup.py b/misc/py-xgboost/files/patch-setup.py
index a5f38829a045..99247ee24d23 100644
--- a/misc/py-xgboost/files/patch-setup.py
+++ b/misc/py-xgboost/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2020-05-25 18:12:50 UTC
+--- setup.py.orig	2021-04-20 00:31:38 UTC
 +++ setup.py
-@@ -57,14 +57,14 @@ def copy_tree(src_dir, target_dir):
+@@ -60,14 +60,14 @@ def copy_tree(src_dir, target_dir):
  
      src = os.path.join(src_dir, 'src')
      inc = os.path.join(src_dir, 'include')
@@ -17,3 +17,21 @@
      clean_copy_tree(rabit, os.path.join(target_dir, 'rabit'))
      clean_copy_tree(cmake, os.path.join(target_dir, 'cmake'))
      clean_copy_tree(plugin, os.path.join(target_dir, 'plugin'))
+@@ -125,7 +125,7 @@ class BuildExt(build_ext.build_ext):  # pylint: disabl
+ 
+     def build_cmake_extension(self):
+         '''Configure and build using CMake'''
+-        if USER_OPTIONS['use-system-libxgboost'][2]:
++        if True or USER_OPTIONS['use-system-libxgboost'][2]: # see https://github.com/dmlc/xgboost/issues/6879
+             self.logger.info('Using system libxgboost.')
+             return
+ 
+@@ -217,7 +217,7 @@ class InstallLib(install_lib.install_lib):
+     def install(self):
+         outfiles = super().install()
+ 
+-        if USER_OPTIONS['use-system-libxgboost'][2] != 0:
++        if True or USER_OPTIONS['use-system-libxgboost'][2] != 0: # see https://github.com/dmlc/xgboost/issues/6879
+             self.logger.info('Using system libxgboost.')
+             lib_path = os.path.join(sys.prefix, 'lib')
+             msg = 'use-system-libxgboost is specified, but ' + lib_name() + \
diff --git a/misc/py-xgboost/files/patch-xgboost_libpath.py b/misc/py-xgboost/files/patch-xgboost_libpath.py
index 12916ce3222b..e3f94a08c138 100644
--- a/misc/py-xgboost/files/patch-xgboost_libpath.py
+++ b/misc/py-xgboost/files/patch-xgboost_libpath.py
@@ -1,14 +1,14 @@
---- xgboost/libpath.py.orig	2020-10-12 22:10:16 UTC
+--- xgboost/libpath.py.orig	2021-04-20 00:31:38 UTC
 +++ xgboost/libpath.py
-@@ -4,6 +4,7 @@
- import os
+@@ -5,6 +5,7 @@ import os
  import platform
+ from typing import List
  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():
+@@ -21,6 +22,8 @@ def find_lib_path() -> List[str]:
      """
      curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
      dll_path = [