summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk18
-rw-r--r--mk/host-bottom.mk12
-rw-r--r--mk/image.mk23
-rw-r--r--mk/kernel-vars.mk16
-rw-r--r--mk/linux-ver.mk36
-rw-r--r--mk/linux.mk1
-rw-r--r--mk/mirrors.mk30
-rw-r--r--mk/pkg-bottom.mk8
-rw-r--r--mk/vars.mk10
9 files changed, 71 insertions, 83 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 1fe387598..89c7303bf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -33,8 +33,6 @@ DEFCONFIG= ADK_DEBUG=n \
ADK_TARGET_USE_SSP=n \
ADK_TOOLCHAIN_WITH_LTO=n \
ADK_TARGET_USE_LTO=n \
- ADK_TOOLCHAIN_WITH_GOLD=n \
- ADK_TARGET_USE_GOLD=n \
ADK_TARGET_USE_GNU_HASHSTYLE=n \
ADK_TARGET_USE_PIE=n \
ADK_TARGET_USE_STATIC_LIBS_ONLY=n \
@@ -103,6 +101,12 @@ POSTCONFIG= -@\
rebuild=1;\
fi; \
done; \
+ for i in ADK_TARGET_DUAL_BOOT ADK_TARGET_QEMU_WITH_GRAPHIC;do \
+ if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
+ touch .rebuild.grub;\
+ rebuild=1;\
+ fi; \
+ done; \
for i in ADK_TARGET_GPU_MEM ADK_LINUX_KERNEL_SND_BCM2708;do \
if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \
touch .rebuild.bcm28xx-bootloader;\
@@ -181,9 +185,13 @@ ifeq ($(ADK_TARGET_OS_BAREMETAL),y)
$(MAKE) -f mk/build.mk package/hostcompile toolchain/final
endif
ifeq ($(ADK_TARGET_OS_LINUX),y)
+ifeq ($(ADK_TARGET_NO_KERNEL),y)
+ $(MAKE) -f mk/build.mk package/hostcompile toolchain/final package_clean package/compile root_clean package/install package_index
+else
$(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index
endif
endif
+endif
package_index:
ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -632,13 +640,13 @@ distclean cleandir:
endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
$(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c
- @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
$(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c
- @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
+ @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c
$(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
- @$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
+ @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*)
@printf " ---> generating menu structure.. "
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk
index f7e635f15..26526dff9 100644
--- a/mk/host-bottom.mk
+++ b/mk/host-bottom.mk
@@ -61,10 +61,12 @@ ifeq (${HOST_CONFIG_STYLE},cmake)
endif
ifeq (${HOST_CONFIG_STYLE},meson)
@$(CMD_TRACE) "configuring meson.. "
- cd ${WRKSRC}; PATH='${HOST_PATH}' \
- meson --prefix $(STAGING_HOST_DIR)/usr \
+ cd ${WRKSRC}; env PATH='${HOST_PATH}' CPPFLAGS='$(HOST_CPPFLAGS)' \
+ LDFLAGS='$(HOST_LDFLAGS)' CFLAGS='$(HOST_CFLAGS)' \
+ meson setup --prefix $(STAGING_HOST_DIR)/usr \
--pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \
--buildtype release $(HOST_MESON_FLAGS) \
+ --wrap-mode=nodownload \
$(WRKSRC) $(WRKBUILD) $(MAKE_TRACE)
endif
ifeq (${HOST_CONFIG_STYLE},perl)
@@ -86,7 +88,7 @@ host-build:
${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE}
@$(CMD_TRACE) "compiling.. "
ifneq ($(filter meson,${HOST_STYLE}),)
- PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
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)
@@ -109,6 +111,10 @@ ifeq (${HOST_INSTALL_STYLE},auto)
cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
endif
+ifeq (${HOST_INSTALL_STYLE},meson)
+ DESTDIR='' PATH='$(HOST_PATH)' \
+ ninja -C $(WRKBUILD) install $(MAKE_TRACE)
+endif
ifeq (${HOST_INSTALL_STYLE},manual)
env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE)
endif
diff --git a/mk/image.mk b/mk/image.mk
index 364b80db3..d2059c5cc 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -13,6 +13,8 @@ ifeq (${ADK_BINSH_ASH},y)
BINSH:=ash
else ifeq (${ADK_BINSH_BASH},y)
BINSH:=bash
+else ifeq (${ADK_BINSH_TOYSH},y)
+BINSH:=toysh
else ifeq (${ADK_BINSH_SASH},y)
BINSH:=sash
else ifeq (${ADK_BINSH_HUSH},y)
@@ -30,6 +32,8 @@ ifeq (${ADK_ROOTSH_ASH},y)
ROOTSH:=/bin/ash
else ifeq (${ADK_ROOTSH_BASH},y)
ROOTSH:=/bin/bash
+else ifeq (${ADK_ROOTSH_TOYSH},y)
+ROOTSH:=/bin/toysh
else ifeq (${ADK_ROOTSH_SASH},y)
ROOTSH:=/bin/sash
else ifeq (${ADK_ROOTSH_HUSH},y)
@@ -160,9 +164,14 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk
( \
echo "nod /dev/console 0644 0 0 c 5 1"; \
echo "nod /dev/tty 0644 0 0 c 5 0"; \
- for i in 0 1 2 3 4; do \
- echo "nod /dev/tty$$i 0644 0 0 c 4 $$$$i"; \
- done; \
+ echo "nod /dev/tty0 0644 0 0 c 4 0"; \
+ echo "nod /dev/tty1 0644 0 0 c 4 1"; \
+ echo "nod /dev/tty2 0644 0 0 c 4 2"; \
+ echo "nod /dev/tty3 0644 0 0 c 4 3"; \
+ echo "nod /dev/tty4 0644 0 0 c 4 4"; \
+ echo "nod /dev/tty5 0644 0 0 c 4 5"; \
+ echo "nod /dev/tty6 0644 0 0 c 4 6"; \
+ echo "nod /dev/tty11 0644 0 0 c 4 11"; \
echo "nod /dev/null 0666 0 0 c 1 3"; \
echo "nod /dev/zero 0666 0 0 c 1 5"; \
echo "nod /dev/kmsg 0644 0 0 c 1 11"; \
@@ -347,7 +356,7 @@ ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package
mkdir -p $(TARGET_DIR)/boot/extlinux
$(CP) $(EXTLINUX) $(TARGET_DIR)/boot/extlinux
$(CP) $(FW_DIR)/kernel $(TARGET_DIR)/boot
- -$(CP) $(FW_DIR)/*.dtb $(TARGET_DIR)/boot
+ -$(CP) $(FW_DIR)/*.dtb $(TARGET_DIR)/boot 2>/dev/null
ifeq ($(ADK_RUNTIME_FIX_PERMISSION),y)
echo '#!/bin/sh' > $(ADK_TOPDIR)/scripts/fakeroot.sh
echo "chown -R 0:0 $(TARGET_DIR)" >> $(ADK_TOPDIR)/scripts/fakeroot.sh
@@ -359,7 +368,7 @@ ifeq ($(ADK_RUNTIME_FIX_PERMISSION),y)
endif
ifeq ($(ADK_TARGET_DUAL_BOOT),y)
$(CP) $(FW_DIR)/kernel $(TARGET_DIR)
- -$(CP) $(FW_DIR)/*.dtb $(TARGET_DIR)
+ -$(CP) $(FW_DIR)/*.dtb $(TARGET_DIR) 2>/dev/null
mkdir $(TARGET_DIR)/extlinux
$(CP) $(EXTLINUX) $(TARGET_DIR)/extlinux
$(SED) "s#root=.*#root=/dev/$(ADK_TARGET_ROOTDEV)p1#" $(TARGET_DIR)/extlinux/extlinux.conf
@@ -393,10 +402,10 @@ endif
ifeq ($(ADK_TARGET_DUAL_BOOT),y)
(cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
PATH='${HOST_PATH}' $(CPIO) -o --quiet -Hustar --owner=0:0 | \
- ${GZIP} -c > ${FW_DIR}/openadk.tar.gz)
+ gzip -c > ${FW_DIR}/openadk.tar.gz)
(cd ${FW_DIR}; PATH='${HOST_PATH}' sha256sum openadk.tar.gz \
| cut -d\ -f1 > sha256.txt)
- (cd ${FW_DIR}; PATH='${HOST_PATH}' tar -cf ${ADK_TARGET_SYSTEM}-update.tar openadk.tar.gzip sha256.txt)
+ (cd ${FW_DIR}; PATH='${HOST_PATH}' tar -cf ${ADK_TARGET_SYSTEM}-update.tar openadk.tar.gz sha256.txt)
@rm -rf ${FW_DIR}/temp
endif
ifeq ($(ADK_PACKAGE_GRUB_EFI_X86)$(ADK_PACKAGE_GRUB_EFI_X86_64),y)
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 475353d6f..e65d513f6 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -15,20 +15,8 @@ KERNEL_MAKE_OPTS+= V=1 \
HOSTCC="${HOST_CC}" \
HOSTCXX="${HOST_CXX}" \
SHELL='${SHELL}' \
- CONFIG_SHELL='${SHELL}'
-
-# regex for relocs needs pcre
-ifeq ($(OS_FOR_BUILD),Darwin)
-KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix -Wl,-no_pie'
-endif
-
-# non-Linux platforms need elf.h
-ifneq ($(OS_FOR_BUILD),Linux)
-KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}'
-KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/usr/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -I${LINUX_DIR}/scripts/dtc/libfdt -DKBUILD_NO_NLS'
-else
-KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}'
-endif
+ CONFIG_SHELL='${SHELL}' \
+ HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)'
ifneq ($(ADK_TARGET_KERNEL_LOADADDR),)
KERNEL_MAKE_OPTS+= LOADADDR=$(ADK_TARGET_KERNEL_LOADADDR)
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 1df185d77..bd66affde 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -15,53 +15,53 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT)
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y)
-KERNEL_FILE_VER:= 6.9.2
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_14),y)
+KERNEL_FILE_VER:= 6.14.4
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9
+KERNEL_HASH:= 9452f28d7a0051fba4886712395b484c4c7fcf9f85944a62fd3d97dc923f5339
endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_8),y)
-KERNEL_FILE_VER:= 6.8.11
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y)
+KERNEL_FILE_VER:= 6.12.25
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= b78dcd09f6b725872a2c0c87a70a064b0fbbcccfe5ce60aa46c669934a9e28b6
+KERNEL_HASH:= c8af780f6f613ca24622116e4c512a764335ab66e75c6643003c16e49a8e3b90
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y)
-KERNEL_FILE_VER:= 6.6.30
+KERNEL_FILE_VER:= 6.6.88
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6
+KERNEL_HASH:= 19df89b63ef7e950de7297dabfac0569183bf87636f4c300a25336c7da490650
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y)
-KERNEL_FILE_VER:= 6.1.90
+KERNEL_FILE_VER:= 6.1.135
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d
+KERNEL_HASH:= e9d17ae1ff96a771e0c5061a50cf9209ce457cf28c8e01165d611523f3957eb9
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y)
-KERNEL_FILE_VER:= 5.15.158
+KERNEL_FILE_VER:= 5.15.180
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6
+KERNEL_HASH:= f51f68b8bbe60aca5e1ff3781f7e5d2ca6a31dd299c8446c39bf880bfff1cd39
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y)
-KERNEL_FILE_VER:= 5.10.216
+KERNEL_FILE_VER:= 5.10.236
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151
+KERNEL_HASH:= 6da5cc8f7d39ed3acb4d59129a3f1570d981526ebbf58ea82595b7b6e000fb89
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y)
-KERNEL_FILE_VER:= 5.4.275
+KERNEL_FILE_VER:= 5.4.292
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c
+KERNEL_HASH:= 0bcbf580d1ea623ac5879d0f2d69796c82431b3f653c4749e63766dbf737be85
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y)
-KERNEL_FILE_VER:= 4.19.313
+KERNEL_FILE_VER:= 4.19.320
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8
+KERNEL_HASH:= 9d671a12b00301b7ce63022d4e4afa3e40aa318f8f7f25a1147e602fdb1047a1
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y)
KERNEL_FILE_VER:= 4.14.334
diff --git a/mk/linux.mk b/mk/linux.mk
index 920c1749b..09f62c2da 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -7,6 +7,7 @@ ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
PKG_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT)
PKG_GIT:= $(ADK_TARGET_LINUX_KERNEL_GIT_TYPE)
PKG_SITES:= $(ADK_TARGET_LINUX_KERNEL_GIT_REPO)
+DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.gz
else
PKG_VERSION:= $(KERNEL_FILE_VER)
PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v6.x/} \
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index a8dc27f6a..dba447fec 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -12,8 +12,8 @@ MASTER_SITE_MIRBSD?= \
ifeq ($(ADK_TARGET_KERNEL_NO_MIRROR),)
MASTER_SITE_KERNEL?= \
+ https://www.kernel.org/pub/linux/ \
http://www.kernel.org/pub/linux/ \
- ftp://www.kernel.org/pub/linux/ \
else
MASTER_SITE_KERNEL?= \
@@ -22,23 +22,8 @@ MASTER_SITE_KERNEL?= \
endif
MASTER_SITE_GNU?= \
+ https://ftp.gnu.org/gnu/ \
http://ftp.gnu.org/gnu/ \
- ftp://ftp.gnu.org/gnu/ \
- ftp://ftp.funet.fi/pub/gnu/prep/ \
- ftp://mirrors.usc.edu/pub/gnu/ \
- ftp://ftp.cs.tu-berlin.de/pub/gnu/ \
- ftp://aeneas.mit.edu/pub/gnu/ \
- ftp://mirrors.dotsrc.org/gnu/ \
- ftp://ftp.wustl.edu/pub/gnu/ \
- ftp://ftp.kddilabs.jp/GNU/ \
- ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ \
- ftp://sunsite.org.uk/package/gnu/ \
- ftp://ftp.informatik.hu-berlin.de/pub/gnu/ \
- ftp://ftp.rediris.es/mirror/gnu/gnu/ \
- ftp://ftp.cs.univ-paris8.fr/mirrors/ftp.gnu.org/ \
- ftp://ftp.chg.ru/pub/gnu/ \
- ftp://ftp.uvsq.fr/pub/gnu/ \
- ftp://ftp.sunet.se/pub/gnu/ \
MASTER_SITE_SOURCEFORGE?= \
http://jaist.dl.sourceforge.net/sourceforge/ \
@@ -50,19 +35,10 @@ MASTER_SITE_SOURCEFORGE?= \
http://easynews.dl.sourceforge.net/sourceforge/ \
MASTER_SITE_MYSQL?= \
- ftp://ftp.fu-berlin.de/unix/databases/mysql/ \
http://sunsite.informatik.rwth-aachen.de/mysql/ \
+ ftp://ftp.fu-berlin.de/unix/databases/mysql/ \
http://mysql.easynet.be/ \
MASTER_SITE_GNOME?= \
https://download.gnome.org/sources/ \
- ftp://ftp.gnome.org/pub/GNOME/sources/ \
- ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/ \
- ftp://ftp.acc.umu.se/pub/GNOME/sources/ \
- ftp://ftp.rpmfind.net/linux/gnome.org/sources/ \
- ftp://ftp.unina.it/pub/linux/GNOME/sources/ \
- ftp://ftp.belnet.be/mirror/ftp.gnome.org/sources/ \
- ftp://ftp.dit.upm.es/linux/gnome/sources/ \
- ftp://ftp.dataplus.se/pub/linux/gnome/sources/ \
- ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/ \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index abc1e1604..d4b50ff12 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -69,7 +69,7 @@ else ifneq ($(filter cmake,${CONFIG_STYLE}),)
-e "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#g" \
$(SCRIPT_DIR)/toolchain.cmake.in > $(SCRIPT_DIR)/toolchain.cmake
(cd ${WRKBUILD} && PATH='${HOST_PATH}' \
- cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ cmake -Wno-dev -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TOOLCHAIN_FILE="$(SCRIPT_DIR)/toolchain.cmake" \
${CMAKE_FLAGS} ${WRKSRC}) $(MAKE_TRACE)
else ifneq ($(filter minimal,${CONFIG_STYLE}),)
@@ -140,11 +140,11 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE}
@env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE)
@$(CMD_TRACE) "compiling.. "
ifneq ($(filter meson,${BUILD_STYLE}),)
- PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
+ PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE)
else ifneq ($(filter manual,${BUILD_STYLE}),)
env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE)
else ifeq ($(strip ${BUILD_STYLE}),)
- cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ cd ${WRKBUILD} && env ${MAKE_ENV} LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ${MAKE} -f ${MAKE_FILE} \
${MAKE_FLAGS} ${ALL_TARGET} $(MAKE_TRACE)
else
@echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2
@@ -168,7 +168,7 @@ ifneq ($(filter meson,${INSTALL_STYLE}),)
else ifneq ($(filter manual,${INSTALL_STYLE}),)
env ${MAKE_ENV} ${MAKE} do-install $(MAKE_TRACE)
else ifeq ($(strip ${INSTALL_STYLE}),)
- cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+ cd ${WRKBUILD} && env ${MAKE_ENV} LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ${MAKE} -f ${MAKE_FILE} \
DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET} $(MAKE_TRACE)
env ${MAKE_ENV} ${MAKE} post-install $(MAKE_TRACE)
else
diff --git a/mk/vars.mk b/mk/vars.mk
index 672f03d9f..91dfc700e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -168,6 +168,10 @@ ifeq ($(ADK_TARGET_ARCH_MIPS),y)
TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float
TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float
endif
+ifeq ($(ADK_TARGET_ARCH_OR1K),y)
+TARGET_CFLAGS+= -m$(ADK_TARGET_FLOAT)-float
+TARGET_CXXFLAGS+= -m$(ADK_TARGET_FLOAT)-float
+endif
endif
ifeq ($(ADK_TARGET_BINFMT_FLAT),y)
@@ -319,11 +323,7 @@ endif
# host compiler and linker flags
HOST_CPPFLAGS:= -I$(STAGING_HOST_DIR)/usr/include
-ifeq ($(OS_FOR_BUILD),Darwin)
-HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib
-else
HOST_LDFLAGS:= -L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
-endif
ifneq (${ADK_UPDATE_PATCHES_GIT},)
PATCH= PATH='${HOST_PATH}' ${BASH} $(SCRIPT_DIR)/patch_git.sh
@@ -335,7 +335,7 @@ PATCHP0= PATH='${HOST_PATH}' patch -p0
ifeq ($(ADK_STATIC_TOOLCHAIN),y)
HOST_STATIC_CFLAGS:= -static -Wl,-static
HOST_STATIC_CXXFLAGS:= -static -Wl,-static
-HOST_STATIC_LDFLAGS:= -Wl,-static
+HOST_STATIC_LDFLAGS:= -Wl,-static -all-static
endif
SED:= PATH='${HOST_PATH}' sed -i -e
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-09 07:25:14 +0000