Merge pull request #8312
pull/470/head5c27fd8depends: Package cleanup (Howard Chu)c1d47ebUpdate randomx: fix Mac linking error (Howard Chu)02e6af2Update CI for aarch64 mac build (selsta)7ea1e21Make Mac SDK into a regular depends package (Howard Chu)e81ab9bSilence some protobuf link warnings (Howard Chu)fe5c2aeFix arm64 darwin package defs (Howard Chu)fb68465Boost 1.64 doesn't recognize arm64 darwin (Howard Chu)617f908more... update to clang 9.0.0 (Howard Chu)83ae3adSplit native_clang out of native_cctools (Howard Chu)1008318Update native_cctools for newer SDK support (Howard Chu)a86c4cbUpdate to MacOSX SDK 11.1, add Mac M1 (Howard Chu)
luigi1111
2 years ago
commit
44c0470e1e
@ -0,0 +1,10 @@
|
|||||||
|
package=darwin_sdk
|
||||||
|
$(package)_version=11.1
|
||||||
|
$(package)_download_path=https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/
|
||||||
|
$(package)_file_name=MacOSX$($(package)_version).sdk.tar.xz
|
||||||
|
$(package)_sha256_hash=68797baaacb52f56f713400de306a58a7ca00b05c3dc6d58f0a8283bcac721f8
|
||||||
|
|
||||||
|
define $(package)_stage_cmds
|
||||||
|
mkdir -p $($(package)_staging_dir)/$(host_prefix)/native/SDK &&\
|
||||||
|
mv * $($(package)_staging_dir)/$(host_prefix)/native/SDK
|
||||||
|
endef
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
package=native_clang
|
||||||
|
$(package)_version=9.0.0
|
||||||
|
$(package)_download_path=https://releases.llvm.org/$($(package)_version)
|
||||||
|
$(package)_download_file=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
|
||||||
|
$(package)_file_name=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
|
||||||
|
$(package)_sha256_hash=a23b082b30c128c9831dbdd96edad26b43f56624d0ad0ea9edec506f5385038d
|
||||||
|
|
||||||
|
define $(package)_extract_cmds
|
||||||
|
echo $($(package)_sha256_hash) $($(package)_source) | sha256sum -c &&\
|
||||||
|
mkdir -p toolchain/bin toolchain/lib/clang/3.5/include && \
|
||||||
|
tar --strip-components=1 -C toolchain -xf $($(package)_source) && \
|
||||||
|
rm -f toolchain/lib/libc++abi.so* && \
|
||||||
|
echo "#!/bin/sh" > toolchain/bin/$(host)-dsymutil && \
|
||||||
|
echo "exit 0" >> toolchain/bin/$(host)-dsymutil && \
|
||||||
|
chmod +x toolchain/bin/$(host)-dsymutil
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(package)_stage_cmds
|
||||||
|
cd $($(package)_extract_dir)/toolchain && \
|
||||||
|
mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include && \
|
||||||
|
mkdir -p $($(package)_staging_prefix_dir)/bin $($(package)_staging_prefix_dir)/include && \
|
||||||
|
cp bin/clang $($(package)_staging_prefix_dir)/bin/ &&\
|
||||||
|
cp -P bin/clang++ $($(package)_staging_prefix_dir)/bin/ &&\
|
||||||
|
cp lib/libLTO.so $($(package)_staging_prefix_dir)/lib/ && \
|
||||||
|
cp -rf lib/clang/$($(package)_version)/include/* $($(package)_staging_prefix_dir)/lib/clang/$($(package)_version)/include/ && \
|
||||||
|
cp bin/dsymutil $($(package)_staging_prefix_dir)/bin/$(host)-dsymutil && \
|
||||||
|
if `test -d include/c++/`; then cp -rf include/c++/ $($(package)_staging_prefix_dir)/include/; fi && \
|
||||||
|
if `test -d lib/c++/`; then cp -rf lib/c++/ $($(package)_staging_prefix_dir)/lib/; fi
|
||||||
|
endef
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
package=native_libtapi
|
||||||
|
$(package)_version=664b8414f89612f2dfd35a9b679c345aa5389026
|
||||||
|
$(package)_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
|
||||||
|
$(package)_download_file=$($(package)_version).tar.gz
|
||||||
|
$(package)_file_name=$(package)-$($(package)_version).tar.gz
|
||||||
|
$(package)_sha256_hash=62e419c12d1c9fad67cc1cd523132bc00db050998337c734c15bc8d73cc02b61
|
||||||
|
$(package)_build_subdir=build
|
||||||
|
$(package)_dependencies=native_clang
|
||||||
|
|
||||||
|
define $(package)_config_cmds
|
||||||
|
echo -n $(build_prefix) > INSTALLPREFIX; \
|
||||||
|
CC=$(host_prefix)/native/bin/clang CXX=$(host_prefix)/native/bin/clang++ \
|
||||||
|
cmake -DCMAKE_INSTALL_PREFIX=$(build_prefix) \
|
||||||
|
-DLLVM_INCLUDE_TESTS=OFF \
|
||||||
|
-DCMAKE_BUILD_TYPE=RELEASE \
|
||||||
|
-DTAPI_REPOSITORY_STRING="1100.0.11" \
|
||||||
|
-DTAPI_FULL_VERSION="11.0.0" \
|
||||||
|
-DCMAKE_CXX_FLAGS="-I $($(package)_extract_dir)/src/llvm/projects/clang/include -I $($(package)_build_dir)/projects/clang/include" \
|
||||||
|
$($(package)_extract_dir)/src/llvm
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(package)_build_cmds
|
||||||
|
$(MAKE) clangBasic && $(MAKE) libtapi
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(package)_stage_cmds
|
||||||
|
$(MAKE) DESTDIR=$($(package)_staging_dir) install-libtapi install-tapi-headers
|
||||||
|
endef
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
--- boost_1_64_0/tools/build/src/tools/darwin.jam.O 2017-04-17 03:22:26.000000000 +0100
|
||||||
|
+++ boost_1_64_0/tools/build/src/tools/darwin.jam 2022-05-04 17:26:29.984464447 +0000
|
||||||
|
@@ -505,7 +505,7 @@
|
||||||
|
if $(instruction-set) {
|
||||||
|
options = -arch$(_)$(instruction-set) ;
|
||||||
|
} else {
|
||||||
|
- options = -arch arm ;
|
||||||
|
+# options = -arch arm ;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,12 +0,0 @@
|
|||||||
--- cctools/Makefile.am.O 2016-06-09 15:06:16.000000000 +0100
|
|
||||||
+++ cctools/Makefile.am 2019-11-18 08:59:20.078663220 +0000
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
if ISDARWIN
|
|
||||||
-SUBDIRS=libstuff ar as misc otool ld64 $(LD_CLASSIC)
|
|
||||||
+SUBDIRS=libstuff ar as misc ld64 $(LD_CLASSIC)
|
|
||||||
else
|
|
||||||
-SUBDIRS=libstuff ar as misc libobjc2 otool ld64 $(LD_CLASSIC)
|
|
||||||
+SUBDIRS=libstuff ar as misc ld64 $(LD_CLASSIC)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
@ -0,0 +1,159 @@
|
|||||||
|
--- src/google/protobuf/descriptor.cc.O 2018-07-30 22:16:10.000000000 +0000
|
||||||
|
+++ src/google/protobuf/descriptor.cc 2022-05-06 13:38:14.827309092 +0000
|
||||||
|
@@ -32,6 +32,9 @@
|
||||||
|
// Based on original Protocol Buffers design by
|
||||||
|
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
#include <algorithm>
|
||||||
|
#include <functional>
|
||||||
|
#include <google/protobuf/stubs/hash.h>
|
||||||
|
@@ -7274,3 +7277,6 @@
|
||||||
|
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/extension_set.cc.O 2018-07-23 20:56:42.000000000 +0000
|
||||||
|
+++ src/google/protobuf/extension_set.cc 2022-05-06 14:48:55.369877050 +0000
|
||||||
|
@@ -32,6 +32,9 @@
|
||||||
|
// Based on original Protocol Buffers design by
|
||||||
|
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
#include <google/protobuf/stubs/hash.h>
|
||||||
|
#include <tuple>
|
||||||
|
#include <utility>
|
||||||
|
@@ -1914,3 +1917,6 @@
|
||||||
|
} // namespace internal
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/extension_set_heavy.cc.O 2018-07-30 22:16:10.000000000 +0000
|
||||||
|
+++ src/google/protobuf/extension_set_heavy.cc 2022-05-06 14:14:27.847320946 +0000
|
||||||
|
@@ -35,6 +35,10 @@
|
||||||
|
// Contains methods defined in extension_set.h which cannot be part of the
|
||||||
|
// lite library because they use descriptors or reflection.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <google/protobuf/stubs/casts.h>
|
||||||
|
#include <google/protobuf/descriptor.pb.h>
|
||||||
|
#include <google/protobuf/io/coded_stream.h>
|
||||||
|
@@ -814,3 +818,6 @@
|
||||||
|
} // namespace internal
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/generated_message_reflection.cc.O 2018-07-23 20:56:42.000000000 +0000
|
||||||
|
+++ src/google/protobuf/generated_message_reflection.cc 2022-05-06 13:38:49.655540772 +0000
|
||||||
|
@@ -32,6 +32,9 @@
|
||||||
|
// Based on original Protocol Buffers design by
|
||||||
|
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
#include <algorithm>
|
||||||
|
#include <set>
|
||||||
|
|
||||||
|
@@ -2420,3 +2423,6 @@
|
||||||
|
} // namespace internal
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/map_field.cc.O 2018-07-23 20:56:42.000000000 +0000
|
||||||
|
+++ src/google/protobuf/map_field.cc 2022-05-06 13:34:44.913905697 +0000
|
||||||
|
@@ -28,6 +28,10 @@
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <google/protobuf/map_field.h>
|
||||||
|
#include <google/protobuf/map_field_inl.h>
|
||||||
|
|
||||||
|
@@ -462,3 +466,6 @@
|
||||||
|
} // namespace internal
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/text_format.cc.O 2018-07-30 22:16:11.000000000 +0000
|
||||||
|
+++ src/google/protobuf/text_format.cc 2022-05-06 13:34:58.881999517 +0000
|
||||||
|
@@ -32,6 +32,10 @@
|
||||||
|
// Based on original Protocol Buffers design by
|
||||||
|
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <algorithm>
|
||||||
|
#include <float.h>
|
||||||
|
#include <math.h>
|
||||||
|
@@ -2258,3 +2262,6 @@
|
||||||
|
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/wire_format.cc.O 2018-07-23 20:56:42.000000000 +0000
|
||||||
|
+++ src/google/protobuf/wire_format.cc 2022-05-06 13:06:23.294219228 +0000
|
||||||
|
@@ -32,6 +32,10 @@
|
||||||
|
// Based on original Protocol Buffers design by
|
||||||
|
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||||
|
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <stack>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
@@ -1445,3 +1449,7 @@
|
||||||
|
} // namespace internal
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
|
--- src/google/protobuf/stubs/status.cc.O 2018-07-23 20:56:42.000000000 +0000
|
||||||
|
+++ src/google/protobuf/stubs/status.cc 2022-05-06 15:18:53.393208814 +0000
|
||||||
|
@@ -27,6 +27,11 @@
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
+
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility push(hidden)
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <google/protobuf/stubs/status.h>
|
||||||
|
|
||||||
|
#include <ostream>
|
||||||
|
@@ -132,3 +137,6 @@
|
||||||
|
} // namespace util
|
||||||
|
} // namespace protobuf
|
||||||
|
} // namespace google
|
||||||
|
+#if defined(__APPLE__) && defined(__arm64__)
|
||||||
|
+#pragma GCC visibility pop
|
||||||
|
+#endif
|
||||||
@ -1 +1 @@
|
|||||||
Subproject commit ae8e98b681766f31d49ac562dd6974906156e07b
|
Subproject commit 85c527a62301b7b8be89d941020308b1cb92b75c
|
||||||
Loading…
Reference in new issue