From 71b90bf3bbe2d160c3744812b65aff778eea24af Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Sun, 5 Aug 2018 15:36:28 +0200 Subject: [PATCH] ppa: Adapt the Makefile to work when building a PPA Signed-off-by: Christian Decker --- external/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/Makefile b/external/Makefile index b6326ada4..24e3e0fc4 100644 --- a/external/Makefile +++ b/external/Makefile @@ -48,7 +48,7 @@ endif EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS))) submodcheck: FORCE - @tools/refresh-submodules.sh $(SUBMODULES) + echo submodcheck disabled $(EXTERNAL_HEADERS): submodcheck @@ -59,7 +59,7 @@ $(TARGET_DIR)/libsodium.a: $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la: external/libsodium/src/libsodium/include/sodium.h cd external/libsodium && ./autogen.sh mkdir -p ${TARGET_DIR}/libsodium-build - cd $(TARGET_DIR)/libsodium-build && $(TOP)/libsodium/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) + cd $(TARGET_DIR)/libsodium-build && $(TOP)/libsodium/configure CC="$(CC)" CFLAGS=-Wno-error --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --enable-tests=no --prefix=/ --libdir=/ && $(MAKE) # libsecp included in libwally. # Wildcards here are magic. See http://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file @@ -90,8 +90,8 @@ $(TARGET_DIR)/libjsmn.a: $(TARGET_DIR)/jsmn-build/jsmn.o # Need separate build dir: changes inside submodule make git think it's dirty. $(TARGET_DIR)/libbacktrace.a: external/libbacktrace/backtrace.h - mkdir -p $(TARGET_DIR)/libbacktrace-build - cd $(TARGET_DIR)/libbacktrace-build && $(TOP)/libbacktrace/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) + @mkdir $(TARGET_DIR)/libbacktrace-build 2>/dev/null || true + cd $(TARGET_DIR)/libbacktrace-build && $(TOP)/libbacktrace/configure CC="$(CC)" CFLAGS=-Wno-error --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) $(MAKE) -C $(TARGET_DIR)/libbacktrace-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec distclean: external-distclean