mirror of
https://github.com/ntop/n2n.git
synced 2024-09-19 16:41:11 +02:00
Convert final user of TARGET==darwin to use the cross-compile variables instead
This commit is contained in:
parent
4b4311e2fa
commit
85c8ab536c
8
.github/workflows/tests.yml
vendored
8
.github/workflows/tests.yml
vendored
|
@ -346,14 +346,6 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
git fetch --force --tags
|
git fetch --force --tags
|
||||||
|
|
||||||
|
|
||||||
- name: generate a makefile and use it to install more packages
|
|
||||||
run: |
|
|
||||||
# This is a pretty big hammer, but gets the windows compile moving
|
|
||||||
./scripts/hack_fakeautoconf.sh
|
|
||||||
make build-dep
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Run a configure step
|
- name: Run a configure step
|
||||||
run: |
|
run: |
|
||||||
export CFLAGS="-fprofile-arcs -ftest-coverage"
|
export CFLAGS="-fprofile-arcs -ftest-coverage"
|
||||||
|
|
24
Makefile
24
Makefile
|
@ -47,10 +47,6 @@ export CONFIG_TARGET
|
||||||
ifndef CONFIG_TARGET
|
ifndef CONFIG_TARGET
|
||||||
ifeq ($(shell uname -o),Msys)
|
ifeq ($(shell uname -o),Msys)
|
||||||
CONFIG_TARGET=mingw
|
CONFIG_TARGET=mingw
|
||||||
else ifeq ($(shell uname -s),Darwin)
|
|
||||||
CONFIG_TARGET=darwin
|
|
||||||
else
|
|
||||||
CONFIG_TARGET=generic
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -172,7 +168,7 @@ APPS+=example_sn_embed
|
||||||
|
|
||||||
DOCS=edge.8.gz supernode.1.gz n2n.7.gz
|
DOCS=edge.8.gz supernode.1.gz n2n.7.gz
|
||||||
|
|
||||||
# This is the superset of all packages that might be needed during the build.
|
# This is the list of Debian/Ubuntu packages that are needed during the build.
|
||||||
# Mostly of use in automated build systems.
|
# Mostly of use in automated build systems.
|
||||||
BUILD_DEP:=\
|
BUILD_DEP:=\
|
||||||
autoconf \
|
autoconf \
|
||||||
|
@ -282,15 +278,21 @@ gcov:
|
||||||
|
|
||||||
# This is a convinent target to use during development or from a CI/CD system
|
# This is a convinent target to use during development or from a CI/CD system
|
||||||
.PHONY: build-dep
|
.PHONY: build-dep
|
||||||
build-dep:
|
|
||||||
ifeq ($(CONFIG_TARGET),generic)
|
ifneq (,$(findstring darwin,$(CONFIG_HOST_OS)))
|
||||||
sudo apt install $(BUILD_DEP)
|
build-dep: build-dep-brew
|
||||||
else ifeq ($(CONFIG_TARGET),darwin)
|
|
||||||
brew install automake gcovr
|
|
||||||
else
|
else
|
||||||
echo Not attempting to install dependancies for system $(CONFIG_TARGET)
|
build-dep: build-dep-dpkg
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
.PHONY: build-dep-dpkg
|
||||||
|
build-dep-dpkg:
|
||||||
|
sudo apt install $(BUILD_DEP)
|
||||||
|
|
||||||
|
.PHONY: build-dep-brew
|
||||||
|
build-dep-brew:
|
||||||
|
brew install automake gcovr
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
rm -f src/edge.o src/supernode.o src/example_edge_embed.o src/example_edge_embed_quick_edge_init.o src/example_sn_embed.o
|
rm -f src/edge.o src/supernode.o src/example_edge_embed.o src/example_edge_embed_quick_edge_init.o src/example_sn_embed.o
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
CONFIG_HOST=@host@
|
CONFIG_HOST=@host@
|
||||||
|
CONFIG_HOST_OS=@host_os@
|
||||||
CONFIG_PREFIX=@prefix@
|
CONFIG_PREFIX=@prefix@
|
||||||
|
|
||||||
PACKAGE_VERSION=@PACKAGE_VERSION@
|
PACKAGE_VERSION=@PACKAGE_VERSION@
|
||||||
|
|
|
@ -110,6 +110,7 @@ AS_IF([test "x$enable_pthread" != xno],
|
||||||
|
|
||||||
|
|
||||||
AC_SUBST(host)
|
AC_SUBST(host)
|
||||||
|
AC_SUBST(host_os)
|
||||||
AC_SUBST(WINDRES)
|
AC_SUBST(WINDRES)
|
||||||
AC_CONFIG_HEADERS(include/config.h)
|
AC_CONFIG_HEADERS(include/config.h)
|
||||||
AC_CONFIG_FILES(config.mak)
|
AC_CONFIG_FILES(config.mak)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user