diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-11-01 12:35:38 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-11-01 15:16:19 +0100 |
| commit | e48e15bff425241ec65f5f892cfd1d2c17a19d67 (patch) | |
| tree | 0ce13510364096f891c7777204a2220404aa226f /package | |
| parent | 2b3bd34a82c6238a9612cf45b8b8730ca0c3c2be (diff) | |
mk: Introduce KERNEL_MAKE variable
This combines the typical kernel make call idiom into a single variable
reference. A side-effect is that parallel make is enabled (via added
'-j' flag) in many cases, but that shouldn't cause harm.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package')
| -rw-r--r-- | package/glibc/Makefile | 6 | ||||
| -rw-r--r-- | package/musl/Makefile | 6 | ||||
| -rw-r--r-- | package/perf/Makefile | 6 | ||||
| -rw-r--r-- | package/uclibc-ng/Makefile | 6 |
4 files changed, 5 insertions, 19 deletions
diff --git a/package/glibc/Makefile b/package/glibc/Makefile index ec0d385a0..b046edda2 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -113,11 +113,7 @@ endif cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_GLIBCVER).so $$file.so; \ done # header package - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_FILE_VER)-1/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr headers_install (cd $(WRKBUILD); \ $(GLIBC_ENV) \ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \ diff --git a/package/musl/Makefile b/package/musl/Makefile index ba31e1f5f..948accabe 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -48,11 +48,7 @@ endif musl-dev-install: ${INSTALL_DIR} ${IDIR_MUSL_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_MUSL_DEV}/usr/lib - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ DESTDIR=$(IDIR_MUSL_DEV) \ install-headers diff --git a/package/perf/Makefile b/package/perf/Makefile index 2e7188c14..61680c399 100644 --- a/package/perf/Makefile +++ b/package/perf/Makefile @@ -28,12 +28,10 @@ BUILD_STYLE:= manual INSTALL_STYLE:= manual do-build: - $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" \ - $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" all + ${KERNEL_MAKE} WERROR=0 -C "$(LINUX_DIR)/tools/perf" all do-install: - $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" \ - $(KERNEL_MAKE_OPTS) WERROR=0 -C "$(LINUX_DIR)/tools/perf" \ + ${KERNEL_MAKE} WERROR=0 -C "$(LINUX_DIR)/tools/perf" \ prefix="$(WRKINST)" install perf-install: diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 765878630..ccc5846a1 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -49,11 +49,7 @@ uclibc-ng-dev-install: -${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib - ${KERNEL_MAKE_ENV} \ - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_FILE_VER)-1/linux-$(KERNEL_FILE_VER) \ - $(KERNEL_MAKE_OPTS) \ - INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \ - headers_install + ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ DEVEL_PREFIX=/usr \ |