espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/libsodium_build_with_gnu_make_v4.3' into 'release/v4.3'

Browse Source 
libsodium: fix build issues with GNU Make (v4.3)

See merge request espressif/esp-idf!14757
This commit is contained in:
Mahavir Jain
2021-08-20 09:34:34 +00:00
parent 8787f15a2d 496f749f63
commit 5fa8c0c088
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/libsodium/component.mk
View File

@@ -16,7 +16,8 @@ COMPONENT_SRCDIRS += \
$(LSRC)/crypto_auth/hmacsha512256 \
$(LSRC)/crypto_box \
$(LSRC)/crypto_box/curve25519xsalsa20poly1305 \
$(LSRC)/crypto_core/curve25519/ref10 \
$(LSRC)/crypto_core/ed25519 \
$(LSRC)/crypto_core/ed25519/ref10 \
$(LSRC)/crypto_core/hchacha20 \
$(LSRC)/crypto_core/hsalsa20/ref2 \
$(LSRC)/crypto_core/hsalsa20 \
@@ -40,6 +41,9 @@ COMPONENT_SRCDIRS += \
$(LSRC)/crypto_scalarmult \
$(LSRC)/crypto_scalarmult/curve25519 \
$(LSRC)/crypto_scalarmult/curve25519/ref10 \
$(LSRC)/crypto_scalarmult/curve25519/sandy2x \
$(LSRC)/crypto_scalarmult/ed25519/ref10 \
$(LSRC)/crypto_scalarmult/ristretto255/ref10 \
$(LSRC)/crypto_secretbox \
$(LSRC)/crypto_secretbox/xsalsa20poly1305 \
$(LSRC)/crypto_shorthash \

17
tools/unit-test-app/components/test_utils/component.mk
View File

@@ -1,3 +1,18 @@
COMPONENT_PRIV_INCLUDEDIRS := private_include
COMPONENT_ADD_INCLUDEDIRS : include
COMPONENT_SRCDIRS := . esp32
COMPONENT_SRCDIRS := .
COMPONENT_OBJS := ccomp_timer.o test_runner.o test_utils.o
ifdef CONFIG_IDF_TARGET_ESP32
COMPONENT_OBJS += ref_clock_impl_rmt_pcnt.o
else
COMPONENT_OBJS += ref_clock_impl_timergroup.o
endif
ifdef CONFIG_IDF_TARGET_ARCH_RISCV
COMPONENT_OBJS += ccomp_timer_impl_riscv.o
endif
ifdef CONFIG_IDF_TARGET_ARCH_XTENSA
COMPONENT_OBJS += ccomp_timer_impl_xtensa.o
endif