From 350d1f75847a0e079ce43fd6b4e49d430bfc1498 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Tue, 26 Nov 2024 09:34:26 -0500 Subject: fix macos and darwin --- contrib/depends/funcs.mk | 4 ---- contrib/depends/packages/boost.mk | 1 + contrib/depends/packages/ncurses.mk | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index 18addcb..70b592f 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -196,10 +196,6 @@ endef COMPRESS_CMD := $(shell if command -v pigz >/dev/null 2>&1; then echo "pigz"; else echo "gzip"; fi) -ifeq ($(COMPRESS_CMD),gzip) - $(AT)echo Slow compression used, you may want to install pigz -endif - define int_add_cmds $($(1)_fetched): $(AT)mkdir -p $$(@D) $(SOURCES_PATH) diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index ea9ca6b..efbfdec 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -34,6 +34,7 @@ $(package)_config_libraries=system,filesystem,thread,timer,date_time,chrono,rege $(package)_cxxflags_linux=-fPIC $(package)_cxxflags_freebsd=-fPIC $(package)_cxxflags_android=-fPIC +$(package)_cxxflags_darwin=-fPIC -std=c++11 $(package)_ldflags_darwin=-L$(host_prefix)/lib -L$(shell xcrun --sdk macosx --show-sdk-path)/usr/lib $(package)_ldflags_ios=-L$(host_prefix)/lib -L$(IOS_SDK)/usr/lib endef diff --git a/contrib/depends/packages/ncurses.mk b/contrib/depends/packages/ncurses.mk index 62af976..770748b 100644 --- a/contrib/depends/packages/ncurses.mk +++ b/contrib/depends/packages/ncurses.mk @@ -21,7 +21,7 @@ define $(package)_set_vars $(package)_config_opts+=--without-tests $(package)_config_opts+=--without-tack $(package)_config_opts+=--without-manpages - $(package)_config_opts+=--with-termlib=tinfo + $(package)_config_opts+=--with-termlib $(package)_config_opts+=--disable-tic-depends $(package)_config_opts+=--disable-big-strings $(package)_config_opts+=--disable-ext-colors @@ -54,10 +54,10 @@ define $(package)_config_cmds endef define $(package)_build_cmds - $(MAKE) -j$(NUM_CORES) $($(package)_build_opts) V=1 + $(MAKE) $($(package)_build_opts) V=1 endef define $(package)_stage_cmds - $(MAKE) -j$(NUM_CORES) install.libs DESTDIR=$($(package)_staging_dir) + $(MAKE) install.libs DESTDIR=$($(package)_staging_dir) endef -- cgit v1.2.3