Skip to content

Commit ca5055a

Browse files
fanquaketheuni
fanquake
and
theuni
committed
depends: native_cctools 921, ld64 409.12, libtapi 1000.10.8
This also removes the obsolete mlinker-version option Co-Authored-By: Cory Fields <[email protected]>
1 parent 1de8c06 commit ca5055a

File tree

4 files changed

+29
-15
lines changed

4 files changed

+29
-15
lines changed

‎depends/hosts/darwin.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
OSX_MIN_VERSION=10.12
22
OSX_SDK_VERSION=10.11
33
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
4-
LD64_VERSION=253.9
5-
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION)
6-
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++
4+
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK)
5+
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -stdlib=libc++
76

87
darwin_CFLAGS=-pipe
98
darwin_CXXFLAGS=$(darwin_CFLAGS)

‎depends/packages/native_cctools.mk

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,55 @@
11
package=native_cctools
2-
$(package)_version=807d6fd1be5d2224872e381870c0a75387fe05e6
3-
$(package)_download_path=https://github.com/theuni/cctools-port/archive
2+
$(package)_version=3764b223c011574971ee3ae09ce968ba5dc2f00f
3+
$(package)_download_path=https://github.com/tpoechtrager/cctools-port/archive
44
$(package)_file_name=$($(package)_version).tar.gz
5-
$(package)_sha256_hash=a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
5+
$(package)_sha256_hash=3e35907bf376269a844df08e03cbb43e345c88125374f2228e03724b5f9a2a04
66
$(package)_build_subdir=cctools
77
$(package)_clang_version=6.0.1
88
$(package)_clang_download_path=https://releases.llvm.org/$($(package)_clang_version)
99
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
1010
$(package)_clang_file_name=clang-llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
1111
$(package)_clang_sha256_hash=fa5416553ca94a8c071a27134c094a5fb736fe1bd0ecc5ef2d9bc02754e1bef0
12+
13+
$(package)_libtapi_version=3efb201881e7a76a21e0554906cf306432539cef
14+
$(package)_libtapi_download_path=https://github.com/tpoechtrager/apple-libtapi/archive
15+
$(package)_libtapi_download_file=$($(package)_libtapi_version).tar.gz
16+
$(package)_libtapi_file_name=$($(package)_libtapi_version).tar.gz
17+
$(package)_libtapi_sha256_hash=380c1ca37cfa04a8699d0887a8d3ee1ad27f3d08baba78887c73b09485c0fbd3
18+
1219
$(package)_extra_sources=$($(package)_clang_file_name)
20+
$(package)_extra_sources += $($(package)_libtapi_file_name)
1321

1422
define $(package)_fetch_cmds
1523
$(call fetch_file,$(package),$($(package)_download_path),$($(package)_download_file),$($(package)_file_name),$($(package)_sha256_hash)) && \
16-
$(call fetch_file,$(package),$($(package)_clang_download_path),$($(package)_clang_download_file),$($(package)_clang_file_name),$($(package)_clang_sha256_hash))
24+
$(call fetch_file,$(package),$($(package)_clang_download_path),$($(package)_clang_download_file),$($(package)_clang_file_name),$($(package)_clang_sha256_hash)) && \
25+
$(call fetch_file,$(package),$($(package)_libtapi_download_path),$($(package)_libtapi_download_file),$($(package)_libtapi_file_name),$($(package)_libtapi_sha256_hash))
1726
endef
1827

1928
define $(package)_extract_cmds
2029
mkdir -p $($(package)_extract_dir) && \
2130
echo "$($(package)_sha256_hash) $($(package)_source)" > $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2231
echo "$($(package)_clang_sha256_hash) $($(package)_source_dir)/$($(package)_clang_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
32+
echo "$($(package)_libtapi_sha256_hash) $($(package)_source_dir)/$($(package)_libtapi_file_name)" >> $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2333
$(build_SHA256SUM) -c $($(package)_extract_dir)/.$($(package)_file_name).hash && \
2434
mkdir -p toolchain/bin toolchain/lib/clang/$($(package)_clang_version)/include && \
35+
mkdir -p libtapi && \
36+
tar --no-same-owner --strip-components=1 -C libtapi -xf $($(package)_source_dir)/$($(package)_libtapi_file_name) && \
2537
tar --no-same-owner --strip-components=1 -C toolchain -xf $($(package)_source_dir)/$($(package)_clang_file_name) && \
2638
rm -f toolchain/lib/libc++abi.so* && \
2739
tar --no-same-owner --strip-components=1 -xf $($(package)_source)
2840
endef
2941

3042
define $(package)_set_vars
31-
$(package)_config_opts=--target=$(host) --disable-lto-support
32-
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
33-
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
34-
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
43+
$(package)_config_opts=--target=$(host) --disable-lto-support --with-libtapi=$($(package)_extract_dir)
44+
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
45+
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
46+
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
3547
endef
3648

3749
define $(package)_preprocess_cmds
38-
cd $($(package)_build_subdir); ./autogen.sh && \
39-
sed -i.old "/define HAVE_PTHREADS/d" ld64/src/ld/InputFiles.h
50+
CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/build.sh && \
51+
CC=$($(package)_cc) CXX=$($(package)_cxx) INSTALLPREFIX=$($(package)_extract_dir) ./libtapi/install.sh && \
52+
sed -i.old "/define HAVE_PTHREADS/d" $($(package)_build_subdir)/ld64/src/ld/InputFiles.h
4053
endef
4154

4255
define $(package)_config_cmds
@@ -49,6 +62,9 @@ endef
4962

5063
define $(package)_stage_cmds
5164
$(MAKE) DESTDIR=$($(package)_staging_dir) install && \
65+
mkdir -p $($(package)_staging_prefix_dir)/lib/ && \
66+
cd $($(package)_extract_dir) && \
67+
cp lib/libtapi.so.6 $($(package)_staging_prefix_dir)/lib/ && \
5268
cd $($(package)_extract_dir)/toolchain && \
5369
mkdir -p $($(package)_staging_prefix_dir)/lib/clang/$($(package)_clang_version)/include && \
5470
mkdir -p $($(package)_staging_prefix_dir)/bin $($(package)_staging_prefix_dir)/include && \

‎depends/packages/qt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ $(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSIO
121121
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
122122
$(package)_config_opts_darwin += -device-option MAC_MIN_VERSION=$(OSX_MIN_VERSION)
123123
$(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
124-
$(package)_config_opts_darwin += -device-option MAC_LD64_VERSION=$(LD64_VERSION)
125124
endif
126125

127126
$(package)_config_opts_linux = -qt-xkbcommon-x11

‎depends/patches/qt/mac-qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ QMAKE_APPLE_DEVICE_ARCHS=x86_64
1818
!host_build: QMAKE_CFLAGS += -target $${MAC_TARGET}
1919
!host_build: QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CFLAGS
2020
!host_build: QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
21-
!host_build: QMAKE_LFLAGS += -target $${MAC_TARGET} -mlinker-version=$${MAC_LD64_VERSION}
21+
!host_build: QMAKE_LFLAGS += -target $${MAC_TARGET}
2222
QMAKE_AR = $${CROSS_COMPILE}ar cq
2323
QMAKE_RANLIB=$${CROSS_COMPILE}ranlib
2424
QMAKE_LIBTOOL=$${CROSS_COMPILE}libtool

0 commit comments

Comments
 (0)