mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

external: Reorganize to support cross-compilation

Browse source 
On CI it is nice to cache the external dependencies. However if we
always compile them in the same folder we cannot cache for multiple
different architectures. After this commit native compile targets will
still live in `external` but cross compiled versions will live in
`external/<arch>`.
This commit is contained in:
Niklas Claesson 2020-01-30 00:15:32 +01:00 • committed by Rusty Russell
parent b8ee4896ed
commit f9b3b96a63
3 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -362,7 +362,7 @@ coverage: coverage/coverage.info
# We make libwallycore.la a dependency, so that it gets built normally, without ncc. # We make libwallycore.la a dependency, so that it gets built normally, without ncc.
# Ncc can't handle the libwally source code (yet). # Ncc can't handle the libwally source code (yet).
ncc: external/libwally-core/src/libwallycore.la ncc: ${TARGET_DIR}/libwally-core-build/src/libwallycore.la
$(MAKE) CC="ncc -ncgcc -ncld -ncfabs" AR=nccar LD=nccld $(MAKE) CC="ncc -ncgcc -ncld -ncfabs" AR=nccar LD=nccld
# Ignore test/ directories. # Ignore test/ directories.

2
external/.gitignore vendored
View file

@ -5,3 +5,5 @@ libsodium.a
libsodium.la libsodium.la
libwallycore.a libwallycore.a
libwallycore.la libwallycore.la
libwally-core-build
libsodium-build

66
external/Makefile vendored
View file

@ -6,6 +6,11 @@ SUBMODULES = \
ifdef BUILD ifdef BUILD
CROSSCOMPILE_OPTS := --host="$(MAKE_HOST)" --build="$(BUILD)" CROSSCOMPILE_OPTS := --host="$(MAKE_HOST)" --build="$(BUILD)"
TARGET_DIR := external/"$(MAKE_HOST)"
TOP := ../..
else
TARGET_DIR := external
TOP := ..
endif endif
LIBSODIUM_HEADERS := external/libsodium/src/libsodium/include/sodium.h LIBSODIUM_HEADERS := external/libsodium/src/libsodium/include/sodium.h
@ -17,45 +22,51 @@ LIBSECP_HEADERS := external/libwally-core/src/secp256k1/include/secp256k1_ecdh.h
JSMN_HEADERS := external/jsmn/jsmn.h JSMN_HEADERS := external/jsmn/jsmn.h
EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS) EXTERNAL_HEADERS := $(LIBSODIUM_HEADERS) $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(JSMN_HEADERS)
EXTERNAL_LIBS := external/libwallycore.a external/libsecp256k1.a external/libjsmn.a external/libbacktrace.a EXTERNAL_LIBS := ${TARGET_DIR}/libwallycore.a ${TARGET_DIR}/libsecp256k1.a ${TARGET_DIR}/libjsmn.a ${TARGET_DIR}/libbacktrace.a
EXTERNAL_INCLUDE_FLAGS := \ EXTERNAL_INCLUDE_FLAGS := \
-I external/libwally-core/include/ \ -I external/libwally-core/include/ \
-I external/libwally-core/src/secp256k1/include/ \ -I external/libwally-core/src/secp256k1/include/ \
-I external/jsmn/ \ -I external/jsmn/ \
-I external/libbacktrace/ \ -I external/libbacktrace/ \
-I external/libbacktrace-build -I ${TARGET_DIR}/libbacktrace-build
ifneq ($(HAVE_GOOD_LIBSODIUM),1) ifneq ($(HAVE_GOOD_LIBSODIUM),1)
EXTERNAL_INCLUDE_FLAGS += -I external/libsodium/src/libsodium/include EXTERNAL_INCLUDE_FLAGS += -I external/libsodium/src/libsodium/include \
EXTERNAL_LIBS += external/libsodium.a -I external/libsodium/src/libsodium/include/sodium \
-I $(TARGET_DIR)/libsodium-build/src/libsodium/include
EXTERNAL_LIBS += ${TARGET_DIR}/libsodium.a
else else
LDLIBS += -lsodium LDLIBS += -lsodium
endif endif
EXTERNAL_LDLIBS := -Lexternal $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS))) EXTERNAL_LDLIBS := -L${TARGET_DIR} $(patsubst lib%.a,-l%,$(notdir $(EXTERNAL_LIBS)))
submodcheck: FORCE submodcheck: FORCE
@tools/refresh-submodules.sh $(SUBMODULES) @tools/refresh-submodules.sh $(SUBMODULES)
# We build libsodium, since Ubuntu xenial has one too old. # We build libsodium, since Ubuntu xenial has one too old.
external/libsodium.a: external/libsodium/src/libsodium/libsodium.la $(TARGET_DIR)/libsodium.a: $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la
$(MAKE) -C external/libsodium DESTDIR=$$(pwd)/external install-exec $(MAKE) -C $(TARGET_DIR)/libsodium-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec
external/libsodium/src/libsodium/include/sodium.h: submodcheck external/libsodium/src/libsodium/include/sodium.h: submodcheck
external/libsodium/src/libsodium/libsodium.la: external/libsodium/src/libsodium/include/sodium.h $(TARGET_DIR)/libsodium-build/src/libsodium/libsodium.la: external/libsodium/src/libsodium/include/sodium.h
cd external/libsodium && ./autogen.sh && ./configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --enable-tests=no --prefix=/ --libdir=/ && $(MAKE) 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 --enable-tests=no --prefix=/ --libdir=/ && $(MAKE)
$(LIBWALLY_HEADERS) $(LIBSECP_HEADERS): submodcheck $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS): submodcheck
# libsecp included in libwally. # 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 # Wildcards here are magic. See http://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file
external/libsecp256k1.% external/libwallycore.%: external/libwally-core/src/secp256k1/libsecp256k1.la external/libwally-core/src/libwallycore.la $(TARGET_DIR)/libsecp256k1.% $(TARGET_DIR)/libwallycore.%: $(TARGET_DIR)/libwally-core-build/src/secp256k1/libsecp256k1.la $(TARGET_DIR)/libwally-core-build/src/libwallycore.la
$(MAKE) -C external/libwally-core DESTDIR=$$(pwd)/external install-exec $(MAKE) -C $(TARGET_DIR)/libwally-core-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec
external/libwally-core/src/libwallycore.% external/libwally-core/src/secp256k1/libsecp256k1.%: $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS) $(TARGET_DIR)/libwally-core-build/src/libwallycore.% $(TARGET_DIR)/libwally-core-build/src/secp256k1/libsecp256k1.%: $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS)
cd external/libwally-core && ./tools/autogen.sh && ./configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-module-recovery --enable-elements --enable-shared=no --prefix=/ --libdir=/ --enable-debug && $(MAKE) cd external/libwally-core && ./tools/autogen.sh
mkdir -p ${TARGET_DIR}/libwally-core-build
cd ${TARGET_DIR}/libwally-core-build && ${TOP}/libwally-core/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-module-recovery --enable-elements --enable-shared=no --prefix=/ --libdir=/ --enable-debug && $(MAKE)
external/jsmn/jsmn.h: submodcheck external/jsmn/jsmn.h: submodcheck
@ -64,32 +75,33 @@ external/jsmn/jsmn.h: submodcheck
external/jsmn/jsmn.c: external/jsmn/jsmn.h external/jsmn/jsmn.c: external/jsmn/jsmn.h
[ -f $@ ] [ -f $@ ]
external/jsmn.o: external/jsmn/jsmn.c Makefile $(TARGET_DIR)/jsmn-build/jsmn.o: external/jsmn/jsmn.c Makefile
$(COMPILE.c) -DJSMN_STRICT=1 $(OUTPUT_OPTION) $< @mkdir -p $(@D)
$(COMPILE.c) -DJSMN_STRICT=1 -o $@ $<
external/libjsmn.a: external/jsmn.o $(TARGET_DIR)/libjsmn.a: $(TARGET_DIR)/jsmn-build/jsmn.o
$(AR) rc $@ $< $(AR) rc $@ $<
external/libbacktrace/backtrace.h: submodcheck external/libbacktrace/backtrace.h: submodcheck
# Need separate build dir: changes inside submodule make git think it's dirty. # Need separate build dir: changes inside submodule make git think it's dirty.
external/libbacktrace.a: external/libbacktrace/backtrace.h $(TARGET_DIR)/libbacktrace.a: external/libbacktrace/backtrace.h
@mkdir external/libbacktrace-build 2>/dev/null || true @mkdir $(TARGET_DIR)/libbacktrace-build 2>/dev/null || true
cd external/libbacktrace-build && ../libbacktrace/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE) cd $(TARGET_DIR)/libbacktrace-build && $(TOP)/libbacktrace/configure CC="$(CC)" --enable-static=yes $(CROSSCOMPILE_OPTS) --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
$(MAKE) -C external/libbacktrace-build DESTDIR=$$(pwd)/external install-exec $(MAKE) -C $(TARGET_DIR)/libbacktrace-build DESTDIR=$$(pwd)/$(TARGET_DIR) install-exec
distclean: external-distclean distclean: external-distclean
clean: external-clean clean: external-clean
external-clean: external-clean:
$(RM) $(EXTERNAL_LIBS) external/*.la external/*.o $(RM) $(EXTERNAL_LIBS) $(TARGET_DIR)/*.la $(TARGET_DIR)/*.o
if [ -f external/libsodium/Makefile ]; then make -C external/libsodium clean; fi if [ -f ${TARGET_DIR}/libsodium-build/Makefile ]; then make -C ${TARGET_DIR}/libsodium-build clean; fi
if [ -f external/libwally-core/Makefile ]; then make -C external/libwally-core clean; fi if [ -f ${TARGET_DIR}/libwally-core-build/Makefile ]; then make -C ${TARGET_DIR}/libwally-core-build clean; fi
if [ -f external/ibwally-core/src/Makefile ]; then make -C external/libwally-core/src clean; fi if [ -f ${TARGET_DIR}/libwally-core-build/src/Makefile ]; then make -C ${TARGET_DIR}/libwally-core-build/src clean; fi
external-distclean: external-distclean:
make -C external/libsodium distclean || true make -C external/libsodium distclean || true
$(RM) -rf external/libbacktrace-build $(RM) -rf ${TARGET_DIR}/libbacktrace-build
$(RM) external/libsodium/src/libsodium/libsodium.la $(RM) ${TARGET_DIR}/libsodium-build/src/libsodium/libsodium.la
$(RM) external/libwally-core/src/secp256k1/libsecp256k1.la external/libwally-core/src/libwallycore.la $(RM) ${TARGET_DIR}/libwally-core-build/src/secp256k1/libsecp256k1.la ${TARGET_DIR}/libwally-core-build/src/libwallycore.la
$(RM) -r `git status --ignored --porcelain external/libwally-core | grep '^!! ' | cut -c3-` $(RM) -r `git status --ignored --porcelain external/libwally-core | grep '^!! ' | cut -c3-`