Skip to content

Commit 322a28f

Browse files
omusSacha0
authored andcommitted
MbedTLS source build fixes (#39131)
1 parent 88cbbc2 commit 322a28f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

deps/mbedtls.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/source-extracted: $(SRCCACHE)/$(MBEDTLS_SRC).tar.gz
2424
mkdir -p $(dir $@) && \
2525
$(TAR) -C $(dir $@) --strip-components 1 -xf $<
2626
# Force-enable MD4
27-
sed "s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" -i $(SRCCACHE)/$(MBEDTLS_SRC)/include/mbedtls/config.h
27+
sed -i.org "s|//#define MBEDTLS_MD4_C|#define MBEDTLS_MD4_C|" $(SRCCACHE)/$(MBEDTLS_SRC)/include/mbedtls/config.h
2828
touch -c $(SRCCACHE)/$(MBEDTLS_SRC)/CMakeLists.txt # old target
2929
echo 1 > $@
3030

@@ -37,7 +37,7 @@ $(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied: $(SRCCACHE)/$(MBE
3737
# are it will be included at least in their next minor release (2.26.0?).
3838
cd $(SRCCACHE)/$(MBEDTLS_SRC) && \
3939
patch -p1 -f < $(SRCDIR)/patches/mbedtls-cmake-findpy.patch
40-
echo 1 > @$
40+
echo 1 > $@
4141

4242
$(BUILDDIR)/$(MBEDTLS_SRC)/build-configured: \
4343
$(SRCCACHE)/$(MBEDTLS_SRC)/mbedtls-cmake-findpy.patch-applied

deps/tools/common.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ CMAKE_CXX_ARG := $(CXX_ARG)
2323
CMAKE_COMMON := -DCMAKE_INSTALL_PREFIX:PATH=$(build_prefix) -DCMAKE_PREFIX_PATH=$(build_prefix)
2424
CMAKE_COMMON += -DCMAKE_INSTALL_LIBDIR=$(build_libdir) -DCMAKE_INSTALL_BINDIR=$(build_bindir)
2525
CMAKE_COMMON += -DLIB_INSTALL_DIR=$(build_shlibdir)
26+
ifeq ($(OS), Darwin)
27+
CMAKE_COMMON += -DCMAKE_MACOSX_RPATH=1
28+
endif
29+
2630
ifneq ($(VERBOSE), 0)
2731
CMAKE_COMMON += -DCMAKE_VERBOSE_MAKEFILE=ON
2832
endif

0 commit comments

Comments
 (0)