Skip to content

Commit 3e5f8a8

Browse files
test patch
1 parent 2cdd423 commit 3e5f8a8

2 files changed

Lines changed: 45 additions & 2 deletions

File tree

depends/packages/native_cctools.mk

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ $(package)_file_name=$($(package)_version).tar.gz
55
$(package)_sha256_hash=a09c9ba4684670a0375e42d9d67e7f12c1f62581a27f28f7c825d6d7032ccc6a
66
$(package)_build_subdir=cctools
77

8+
# === NEW: Proper dependency ===
9+
$(package)_deps=native_libobjc2
10+
11+
# LLVM/Clang bundle for cctools
812
$(package)_clang_version=3.7.1
913
$(package)_clang_download_path=http://llvm.org/releases/$($(package)_clang_version)
1014
$(package)_clang_download_file=clang+llvm-$($(package)_clang_version)-x86_64-linux-gnu-ubuntu-14.04.tar.xz
@@ -32,13 +36,22 @@ define $(package)_extract_cmds
3236
tar --strip-components=1 -xf $($(package)_source)
3337
endef
3438

39+
### ======================================
40+
### CONFIG VARS — UPDATED FOR libobjc2
41+
### ======================================
3542
define $(package)_set_vars
43+
3644
$(package)_config_opts=--target=$(host) --disable-lto-support
3745
$(package)_ldflags+=-Wl,-rpath=\\$$$$$$$$\$$$$$$$$ORIGIN/../lib
3846

3947
$(package)_cc=$($(package)_extract_dir)/toolchain/bin/clang
4048
$(package)_cxx=$($(package)_extract_dir)/toolchain/bin/clang++
4149

50+
# === NEW: Inject native_libobjc2 paths ===
51+
$(package)_cflags+=-I$($(package)_staging_prefix_dir)/../native/include
52+
$(package)_cxxflags+=-I$($(package)_staging_prefix_dir)/../native/include
53+
$(package)_ldflags+=-L$($(package)_staging_prefix_dir)/../native/lib -lobjc
54+
4255
ifeq ($(host_os),darwin)
4356
$(package)_cc=gcc
4457
$(package)_cxx=g++
@@ -50,11 +63,18 @@ endif
5063

5164
endef
5265

66+
### ======================================
67+
### PREPROCESS — CLEAN PATCHES ONLY
68+
### ======================================
5369
define $(package)_preprocess_cmds
5470
cd $($(package)_build_subdir); ./autogen.sh && \
5571
sed -i.old "/define HAVE_PTHREADS/d" ld64/src/ld/InputFiles.h && \
56-
sed -i.old2 's/ libobjc2//g' Makefile.am && \
57-
sed -i.old3 's/ libobjc2//g' Makefile.in
72+
\
73+
# === Remove internal libobjc2 references (we replace with native_libobjc2) ===
74+
sed -i.old2 's|\.\./libobjc2/libobjc.la||g' otool/Makefile.am && \
75+
sed -i.old3 's|\.\./libobjc2/libobjc.la||g' otool/Makefile.in && \
76+
sed -i.old4 's/ libobjc2//g' Makefile.am && \
77+
sed -i.old5 's/ libobjc2//g' Makefile.in
5878
endef
5979

6080
define $(package)_config_cmds
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package=native_libobjc2
2+
$(package)_version=2.2
3+
$(package)_download_path=https://github.com/gnustep/libobjc2/releases/download/v$($(package)_version)
4+
$(package)_file_name=libobjc2-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=0d6e02aa527daabd973a5c7b2e391726a0d89b1e42e9e9a13093cf9f5a353a0d
6+
7+
define $(package)_extract_cmds
8+
mkdir -p $($(package)_extract_dir) && \
9+
tar -xzf $($(package)_source) -C $($(package)_extract_dir) --strip-components=1
10+
endef
11+
12+
define $(package)_build_cmds
13+
cmake -DCMAKE_BUILD_TYPE=Release \
14+
-DCMAKE_INSTALL_PREFIX=$($(package)_staging_prefix_dir) \
15+
-DCMAKE_C_COMPILER=$(CC) \
16+
-DCMAKE_CXX_COMPILER=$(CXX) \
17+
. && \
18+
$(MAKE)
19+
endef
20+
21+
define $(package)_stage_cmds
22+
$(MAKE) install
23+
endef

0 commit comments

Comments
 (0)