diff options
| author | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-11-26 08:50:25 -0500 |
|---|---|---|
| committer | Czarek Nakamoto <cyjan@mrcyjanek.net> | 2024-11-26 08:50:31 -0500 |
| commit | 74cd654f0deb0405c34a8e58be4ec5e1cdc4382b (patch) | |
| tree | 32bc6c3626c5ec3ebd609a78183dbee1262491a9 | |
| parent | 8a1e33f57494cffd2116ee2c5b62abe3d4b57017 (diff) | |
fix iOS build issues
fix dummy ledger patch
| -rw-r--r-- | contrib/depends/funcs.mk | 2 | ||||
| -rw-r--r-- | contrib/depends/packages/sodium.mk | 3 | ||||
| -rw-r--r-- | patches/monero/0008-add-dummy-device-for-ledger.patch | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk index f98b938..18addcb 100644 --- a/contrib/depends/funcs.mk +++ b/contrib/depends/funcs.mk @@ -221,7 +221,7 @@ $($(1)_preprocessed): | $($(1)_dependencies) $($(1)_extracted) $(AT)touch $$@ $($(1)_configured): | $($(1)_preprocessed) $(AT)echo Configuring $(1)... - $(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar xf $($(package)_cached) --use-compress-program='$(COMPRESS_CMD)'; ) + $(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar xf $($(package)_cached); ) $(AT)mkdir -p $$(@D) $(AT)+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1)) $(AT)touch $$@ diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk index 1289c86..8e85a4e 100644 --- a/contrib/depends/packages/sodium.mk +++ b/contrib/depends/packages/sodium.mk @@ -9,7 +9,6 @@ define $(package)_set_vars $(package)_config_env_android=ANDROID_NDK_ROOT="$(host_prefix)/native" PATH="$(host_prefix)/native/bin" CC=clang AR=ar RANLIB=ranlib $(package)_config_opts=--enable-static --disable-shared --with-pic $(package)_config_opts+=--prefix=$(host_prefix) -$(package)_ar_ios=$($(package)_ar) rcs endef define $(package)_preprocess_cmds @@ -26,7 +25,7 @@ define $(package)_build_cmds endef define $(package)_stage_cmds - $(MAKE) -j$(NUM_CORES) DESTDIR=$($(package)_staging_dir) install + $(MAKE) DESTDIR=$($(package)_staging_dir) install endef define $(package)_postprocess_cmds diff --git a/patches/monero/0008-add-dummy-device-for-ledger.patch b/patches/monero/0008-add-dummy-device-for-ledger.patch index edca077..68e072e 100644 --- a/patches/monero/0008-add-dummy-device-for-ledger.patch +++ b/patches/monero/0008-add-dummy-device-for-ledger.patch @@ -85,7 +85,7 @@ index e6cd358b6..636929feb 100644 device_registry::device_registry(){ hw::core::register_all(registry); - #ifdef WITH_DEVICE_LEDGER -+ #if defined(WITH_DEVICE_LEDGER) || defined(HIDAPI_DUMMY) ++ #if defined(WITH_DEVICE_LEDGER) && !defined(HIDAPI_DUMMY) hw::ledger::register_all(registry); #endif atexit(clear_device_registry); |