diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-14 03:25:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-14 03:25:43 +0100 |
| commit | b488c69504c18398563538ac62f6ef665cee068e (patch) | |
| tree | 83daa4aee89cea0c42f3659b5f668189ed5195c9 /mk | |
| parent | b1c3b3703dab3635af772b7476bb185d87066f88 (diff) | |
| parent | 9cb13ad8c7d0c7862949368006d78dfe1b079665 (diff) | |
Merge branch 'master' of gogs.waldemar-brodkorb.de:oss/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 12 | ||||
| -rw-r--r-- | mk/perl.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 29cfc57ea..621693ec3 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -59,6 +59,14 @@ ifeq (${HOST_CONFIG_STYLE},cmake) cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \ ${HOST_CMAKE_FLAGS} ${WRKSRC} $(MAKE_TRACE) endif +ifeq (${HOST_CONFIG_STYLE},meson) + @$(CMD_TRACE) "configuring meson.. " + cd ${WRKSRC}; PATH='${HOST_PATH}' \ + meson --prefix $(STAGING_HOST_DIR)/usr \ + --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ + --buildtype release $(MESON_FLAGS) \ + $(WRKSRC) $(WRKBUILD) +endif ifeq (${HOST_CONFIG_STYLE},perl) @$(CMD_TRACE) "configuring perl module.. " cd ${WRKBUILD}; \ @@ -77,7 +85,9 @@ endif host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " -ifneq (${HOST_STYLE},manual) +ifneq ($(filter meson,${HOST_STYLE}),) + PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) +else ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) endif diff --git a/mk/perl.mk b/mk/perl.mk index c28a4aef3..893e8cb11 100644 --- a/mk/perl.mk +++ b/mk/perl.mk @@ -1,4 +1,4 @@ -PERL_VERSION=5.24.1 +PERL_VERSION=5.32.1 PERL_ARCHNAME:=$(ADK_TARGET_CPU_ARCH)-linux PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION) PERL_INCDIR:=/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE diff --git a/mk/vars.mk b/mk/vars.mk index e476b8938..bc8b44646 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -236,13 +236,11 @@ endif # special architecture optimization flags ifeq ($(ADK_TARGET_ARCH_XTENSA),y) -ifeq ($(ADK_TARGET_BIG_ENDIAN),) ifeq ($(ADK_TARGET_LIB_NEWLIB),) TARGET_CFLAGS+= -mlongcalls -mauto-litpools TARGET_CXXFLAGS+= -mlongcalls -mauto-litpools endif endif -endif ifeq ($(ADK_TARGET_ARCH_MICROBLAZE),y) TARGET_CFLAGS+= -mxl-barrel-shift TARGET_CXXFLAGS+= -mxl-barrel-shift |