From bc118526b7bf1061b26eda0b18564fc8b078333e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 14 Jan 2024 03:20:42 +0000 Subject: [PATCH 1/4] fakeroot: drop PKG_TOOLCHAIN hardcoding - already defaults to configure --- packages/devel/fakeroot/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devel/fakeroot/package.mk b/packages/devel/fakeroot/package.mk index fef5606a93..6ac0905b4d 100644 --- a/packages/devel/fakeroot/package.mk +++ b/packages/devel/fakeroot/package.mk @@ -10,7 +10,6 @@ PKG_SITE="https://tracker.debian.org/pkg/fakeroot" PKG_URL="http://ftp.debian.org/debian/pool/main/f/fakeroot/${PKG_NAME}_${PKG_VERSION}.orig.tar.gz" PKG_DEPENDS_HOST="ccache:host libcap:host autoconf:host libtool:host" PKG_LONGDESC="fakeroot provides a fake root environment by means of LD_PRELOAD and SYSV IPC (or TCP) trickery." -PKG_TOOLCHAIN="configure" PKG_CONFIGURE_OPTS_HOST="--with-gnu-ld" From 517875c017e11dbf0411b07bc262a31be0622843 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 14 Jan 2024 04:14:54 +0000 Subject: [PATCH 2/4] bcm2835-utils: drop PKG_TOOLCHAIN hardcoding - already defaults to cmake --- packages/tools/bcm2835-utils/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/tools/bcm2835-utils/package.mk b/packages/tools/bcm2835-utils/package.mk index 3b107f3a1c..8bc3449919 100644 --- a/packages/tools/bcm2835-utils/package.mk +++ b/packages/tools/bcm2835-utils/package.mk @@ -10,7 +10,6 @@ PKG_SITE="https://github.com/raspberrypi/utils" PKG_URL="https://github.com/raspberrypi/utils/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain dtc" PKG_LONGDESC="Raspberry Pi related collection of scripts and simple applications" -PKG_TOOLCHAIN="cmake" makeinstall_target() { mkdir -p ${INSTALL}/usr/bin From 3b0e6d5c8a09596744a2634028e76aecfcd9db6e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 14 Jan 2024 04:35:42 +0000 Subject: [PATCH 3/4] scripts/build: handle GNUmakefile in addition to Makefile for PKG_TOOLCHAIN=make --- scripts/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index 311ba6c5c4..98d6e9c612 100755 --- a/scripts/build +++ b/scripts/build @@ -104,7 +104,7 @@ if [ -z "${PKG_TOOLCHAIN}" -o "${PKG_TOOLCHAIN}" = "auto" ]; then PKG_TOOLCHAIN="cmake" elif [ -f "${PKG_CONFIGURE_SCRIPT}" ]; then PKG_TOOLCHAIN="configure" - elif [ -f "${PKG_BUILD}/Makefile" ]; then + elif [ -f "${PKG_BUILD}/GNUmakefile" -o -f "${PKG_BUILD}/Makefile" ]; then PKG_TOOLCHAIN="make" else die "Not possible to detect toolchain automatically. Add PKG_TOOLCHAIN= to package.mk" From 49b2a81bc7de00403b1e7b381a57c627ce3641b0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 14 Jan 2024 04:34:27 +0000 Subject: [PATCH 4/4] bemenu: drop PKG_TOOLCHAIN hardcoding - defaults to make GNUmakefile is used by bemenu. The update to scripts/build handles GNUmakefile in addition to Makefile for PKG_TOOLCHAIN=make --- packages/wayland/util/bemenu/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/wayland/util/bemenu/package.mk b/packages/wayland/util/bemenu/package.mk index ff6389b02c..af797ba0a7 100644 --- a/packages/wayland/util/bemenu/package.mk +++ b/packages/wayland/util/bemenu/package.mk @@ -9,7 +9,6 @@ PKG_SITE="https://github.com/Cloudef/bemenu" PKG_URL="https://github.com/Cloudef/bemenu/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain glib wayland wayland-protocols cairo pango libxkbcommon" PKG_LONGDESC="Dynamic menu library and client program inspired by dmenu" -PKG_TOOLCHAIN="make" PKG_MAKE_OPTS_TARGET="PREFIX=/usr clients wayland"