From 35fa84737e00b09f20b66f3bbd534a49a985a10d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 11 Jun 2014 15:45:54 +0200 Subject: fix linux header installation on Darwin --- package/glibc/Makefile | 4 +++- package/musl/Makefile | 5 ++++- package/uclibc/Makefile | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 26e6a1998..3295fba54 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/kernel-ver.mk +include $(TOPDIR)/mk/kernel-vars.mk include $(TOPDIR)/toolchain/glibc/Makefile.inc PKG_NAME:= glibc @@ -71,8 +72,9 @@ endif cd $(IDIR_GLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(PKG_VERSION).so $$file.so; \ done # header package + ${KERNEL_MAKE_ENV} \ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ - HOSTCC=$(CC_FOR_BUILD) ARCH=$(ADK_TARGET_KARCH) V=1 \ + $(KERNEL_MAKE_OPTS) \ INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ diff --git a/package/musl/Makefile b/package/musl/Makefile index 2c3302322..77f16a369 100644 --- a/package/musl/Makefile +++ b/package/musl/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/kernel-ver.mk +include $(TOPDIR)/mk/kernel-vars.mk include $(TOPDIR)/toolchain/musl/Makefile.inc PKG_NAME:= musl @@ -69,7 +70,9 @@ endif musl-dev-install: ${INSTALL_DIR} ${IDIR_MUSL_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_MUSL_DEV}/usr/lib - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_KARCH) V=1 \ + ${KERNEL_MAKE_ENV} \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ + $(KERNEL_MAKE_OPTS) \ 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} \ diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile index 505ed4a7b..5de66477f 100644 --- a/package/uclibc/Makefile +++ b/package/uclibc/Makefile @@ -3,6 +3,7 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/mk/kernel-ver.mk +include $(TOPDIR)/mk/kernel-vars.mk include $(TOPDIR)/toolchain/uclibc/Makefile.inc PKG_NAME:= uClibc @@ -52,7 +53,9 @@ uclibc-dev-install: for file in libcrypt libdl libm libresolv libutil; do \ cd $(IDIR_UCLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(GIT_VERSION).so $$file.so; \ done - $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_KARCH) V=1 \ + ${KERNEL_MAKE_ENV} \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \ + $(KERNEL_MAKE_OPTS) \ INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \ headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ -- cgit v1.2.3