mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-02-02 21:13:07 +00:00
ci improvement - 2
This commit is contained in:
parent
c1dcfc55f7
commit
2ba9f75e69
32
Makefile
32
Makefile
@ -168,20 +168,32 @@ ifneq ($(LIBBACKTRACE_PATH),)
|
||||
endif
|
||||
|
||||
# Get nat-traversal path from nimble for building native libs
|
||||
# Note: nimble sync already builds these during package setup, so we only need to
|
||||
# locate the built libraries for linking. If libs are missing, rebuild them.
|
||||
nat-libs:
|
||||
@NAT_PATH=$$(nimble path nat_traversal 2>/dev/null); \
|
||||
if [ -n "$$NAT_PATH" ]; then \
|
||||
echo "Building miniupnpc..."; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/miniupnp/miniupnpc build/libminiupnpc.a; \
|
||||
echo "Building libnatpmp..."; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/libnatpmp-upstream libnatpmp.a; \
|
||||
@NAT_PATH=$$(nimble path nat_traversal 2>/dev/null | grep -v "^Info:" | grep -v "^Warning:" | head -1); \
|
||||
if [ -n "$$NAT_PATH" ] && [ -d "$$NAT_PATH" ]; then \
|
||||
if [ ! -f "$$NAT_PATH/vendor/miniupnp/miniupnpc/build/libminiupnpc.a" ]; then \
|
||||
echo "Building miniupnpc..."; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/miniupnp/miniupnpc build/libminiupnpc.a CFLAGS="-Os -fPIC" $(HANDLE_OUTPUT); \
|
||||
else \
|
||||
echo "miniupnpc already built"; \
|
||||
fi; \
|
||||
if [ ! -f "$$NAT_PATH/vendor/libnatpmp-upstream/libnatpmp.a" ]; then \
|
||||
echo "Building libnatpmp..."; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/libnatpmp-upstream libnatpmp.a CFLAGS="-Wall -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4" $(HANDLE_OUTPUT); \
|
||||
else \
|
||||
echo "libnatpmp already built"; \
|
||||
fi; \
|
||||
else \
|
||||
echo "Warning: nat_traversal package not found, skipping nat-libs build"; \
|
||||
fi
|
||||
|
||||
clean-nat-libs:
|
||||
@NAT_PATH=$$(nimble path nat_traversal 2>/dev/null); \
|
||||
if [ -n "$$NAT_PATH" ]; then \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/miniupnp/miniupnpc clean; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/libnatpmp-upstream clean; \
|
||||
@NAT_PATH=$$(nimble path nat_traversal 2>/dev/null | grep -v "^Info:" | grep -v "^Warning:" | head -1); \
|
||||
if [ -n "$$NAT_PATH" ] && [ -d "$$NAT_PATH" ]; then \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/miniupnp/miniupnpc clean $(HANDLE_OUTPUT) || true; \
|
||||
$(MAKE) -C $$NAT_PATH/vendor/libnatpmp-upstream clean $(HANDLE_OUTPUT) || true; \
|
||||
fi
|
||||
|
||||
# Extend deps and clean targets
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user