entirely drop HOSTCC stuff

11 files changed, 20 insertions, 44 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 6e752a8da..74b9cb474 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-static \
 			--with-dri-drivers=${DRI_DRIVERS},swrast \
 			--with-demos=xdemos
 
-XAKE_FLAGS+=		HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
+XAKE_FLAGS+=		HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index bcd582179..93098145a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -35,30 +35,34 @@ ifeq ($(ADK_NATIVE),y)
 	yes '' | \
 	$(MAKE) V=1 \
 	    IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 else
 	yes '' | \
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
 	    EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \
-	    ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
+	    ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE)
 endif
 
 do-build:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) busybox
 endif
 
 do-install:
 ifeq ($(ADK_NATIVE),y)
 	$(MAKE) V=1 \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 else
 	$(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \
-	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE)
+	    IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(CC_FOR_BUILD)" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+		-C $(WRKBUILD) install $(MAKE_TRACE)
 endif
 	$(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/
 ifeq ($(ADK_DEBUG),y)
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index a7ce3a9c8..291186507 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -61,8 +61,8 @@ CONFIGURE_ARGS+=	--disable-sample \
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/include \
-		CC="${HOSTCC}" \
-		LINK="${HOSTCC} -o makemd5 -lc" \
+		CC="${CC_FOR_BUILD}" \
+		LINK="${CC_FOR_BUILD} -o makemd5 -lc" \
 		LIBS="" \
 		CFLAGS="" \
 		LDFLAGS="" \
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 60d35f1ee..4f72f2400 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -91,7 +91,7 @@ eglibc-dev-install:
 	cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 7733cf7ca..43321ad22 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -62,7 +62,7 @@ glibc-dev-install:
 	done
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
-		HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
+		HOSTCC=$(CC_FOR_BUILD) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
 		headers_install
 	(cd $(WRKBUILD); \
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index be4e93c61..e681dbee8 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -17,7 +17,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
-CONFIGURE_ARGS+=	--with-build-cc=${HOSTCC}
+CONFIGURE_ARGS+=	--with-build-cc=${CC_FOR_BUILD}
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 12259ddba..20f37ecac 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RE
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
-			--with-build-cc=${HOSTCC} \
+			--with-build-cc=${CC_FOR_BUILD} \
 			--without-progs \
 			--with-fallbacks \
 			--disable-termcap \
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index f467cbaf0..4f6f1c671 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -41,7 +41,7 @@ pre-configure:
 		${PKG_CONFIGURE_ARGS} \
 	);
 	${MAKE} -C "${WRKBUILD}/src/bin/pg_config" \
-		CC="${HOSTCC}" \
+		CC="${CC_FOR_BUILD}" \
 		DESTDIR="${WRKINST}" \
 		all install
 
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index 6eb5d62d3..652dc1b6b 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TCPDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \
+CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${CC_FOR_BUILD} \
 			ac_cv_linux_vers=2 \
 			td_cv_buggygetaddrinfo="no"
 CONFIGURE_ARGS+=	--without-crypto
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 90b9f49f9..5bb092294 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -55,7 +55,7 @@ uclibc-dev-install:
 		PREFIX=$(IDIR_UCLIBC_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_DEV)/ \
-		HOSTCC="$(HOSTCC)" \
+		HOSTCC="$(CC_FOR_BUILD)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		install_headers
 	@find $(IDIR_UCLIBC_DEV) -name .install -exec rm {} \;
diff --git a/package/x11-headers/Makefile b/package/x11-headers/Makefile
deleted file mode 100644
index afba71098..000000000
--- a/package/x11-headers/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		x11-headers
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		1
-PKG_DESCR:=		X11 header files
-PKG_BUILDDEP:=		xproto xtrans xextproto
-PKG_BUILDDEP+=		xcmiscproto bigreqsproto kbproto inputproto
-PKG_SECTION:=		devel
-
-NO_DISTFILES:=		1
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,X11_HEADERS,x11-headers,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-do-install: 
-	${INSTALL_DIR} ${IDIR_X11_HEADERS}/usr/include
-	${CP} ${STAGING_TARGET_DIR}/usr/include/X11 ${IDIR_X11_HEADERS}/usr/include
-
-include ${TOPDIR}/mk/pkg-bottom.mk