You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by mp...@apache.org on 2019/02/04 18:17:57 UTC

[kudu] branch master updated: KUDU-2411: macOS: Ship fewer deps with binary artifact

This is an automated email from the ASF dual-hosted git repository.

mpercy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new 47a96ae  KUDU-2411: macOS: Ship fewer deps with binary artifact
47a96ae is described below

commit 47a96ae53f4aa712c6a79c04a54a442aeedc8d4d
Author: Mike Percy <mp...@apache.org>
AuthorDate: Sun Feb 3 13:42:54 2019 -0800

    KUDU-2411: macOS: Ship fewer deps with binary artifact
    
    This patch removes some dependencies from the shipped binary artifact to
    address some ABI compatibility problems observed during testing.
    
    Change-Id: If7e7f8dac1e50a6300077296cea7928a1386e283
    Reviewed-on: http://gerrit.cloudera.org:8080/12349
    Tested-by: Kudu Jenkins
    Reviewed-by: Grant Henke <gr...@apache.org>
    Tested-by: Grant Henke <gr...@apache.org>
---
 .../relocate_binaries_for_mini_cluster.py          | 29 ++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py b/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
index e5bb31e..736a419 100755
--- a/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
+++ b/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
@@ -61,8 +61,33 @@ PAT_LINUX_LIB_EXCLUDE = re.compile(r"""(libpthread|
 
 # We don't want to ship libSystem because it includes kernel and thread
 # routines that we assume may not be portable between macOS versions.
-# TODO(mpercy): consider excluding libc++ as well.
-PAT_MACOS_LIB_EXCLUDE = re.compile(r"libSystem")
+# Also do not ship core libraries that come with the default macOS install
+# unless we know that we need to for ABI reasons.
+PAT_MACOS_LIB_EXCLUDE = re.compile(r"""(AppleFSCompression$|
+                                        CFNetwork$|
+                                        CoreFoundation$|
+                                        CoreServices$|
+                                        DiskArbitration$|
+                                        IOKit$|
+                                        Foundation$|
+                                        Security$|
+                                        SystemConfiguration$|
+                                        libCRFSuite|
+                                        libDiagnosticMessagesClient|
+                                        libSystem|
+                                        libapple_nghttp2|
+                                        libarchive|
+                                        libc\+\+|
+                                        libenergytrace|
+                                        libicucore|
+                                        libncurses|
+                                        libnetwork|
+                                        libobjc|
+                                        libresolv|
+                                        libsasl2|
+                                        libxar
+                                       )""",
+                                       re.VERBOSE)
 
 # Config keys.
 BUILD_ROOT = 'build_root'