瀏覽代碼

try to fix ncurses build on buildserver

Waldemar Brodkorb 10 年之前
父節點
當前提交
a852b04356
共有 3 個文件被更改,包括 25 次插入20 次删除
  1. 18 18
      mk/host-bottom.mk
  2. 5 0
      mk/host.mk
  3. 2 2
      package/ncurses/Makefile

+ 18 - 18
mk/host-bottom.mk

@@ -20,18 +20,19 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE}
 			${CP} ${SCRIPT_DIR}/config.guess $$i; \
 	        fi; \
 	    done;
-ifneq ($(filter auto,${HOST_STYLE}),)
+ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD}; rm -f config.{cache,status}; \
 	    env ${HOST_CONFIGURE_ENV} \
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=${STAGING_HOST_DIR}/usr \
-	    --bindir=${STAGING_HOST_DIR}/usr/bin \
-	    --datadir=${STAGING_HOST_DIR}/usr/share \
-	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
-	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
-	    --sysconfdir=${STAGING_HOST_DIR}/etc \
+	    --prefix=/usr \
+	    --bindir=/usr/bin \
+	    --datadir=/usr/share \
+	    --mandir=/usr/share/man \
+	    --libexecdir=/usr/libexec \
+	    --localstatedir=/var \
+	    --sysconfdir=/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
@@ -42,13 +43,12 @@ else
 	    ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \
 	    --program-prefix= \
 	    --program-suffix= \
-	    --prefix=/usr \
-	    --bindir=/usr/bin \
-	    --datadir=/usr/share \
-	    --mandir=/usr/share/man \
-	    --libexecdir=/usr/libexec \
-	    --localstatedir=/var \
-	    --sysconfdir=/etc \
+	    --prefix=${STAGING_HOST_DIR}/usr \
+	    --bindir=${STAGING_HOST_DIR}/usr/bin \
+	    --datadir=${STAGING_HOST_DIR}/usr/share \
+	    --mandir=${STAGING_HOST_DIR}/usr/share/man \
+	    --libexecdir=${STAGING_HOST_DIR}/usr/libexec \
+	    --sysconfdir=${STAGING_HOST_DIR}/etc \
 	    --disable-dependency-tracking \
 	    --disable-libtool-lock \
 	    --disable-nls \
@@ -67,13 +67,13 @@ hpkg-install: ${ALL_HOSTINST}
 host-install:
 ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE}
 	@$(CMD_TRACE) "host installing... "
-ifneq ($(filter auto,${HOST_STYLE}),)
-	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
-	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
-else
+ifeq ($(strip ${HOST_STYLE}),)
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
 	    DESTDIR='${HOST_WRKINST}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 	env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE)
+else
+	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
+	    DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE)
 endif
 	rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC}
 	exec ${MAKE} host-extract $(MAKE_TRACE)

+ 5 - 0
mk/host.mk

@@ -20,6 +20,11 @@ HOST_FAKE_FLAGS?=
 HOST_ALL_TARGET?=	all
 HOST_INSTALL_TARGET?=	install
 
+HOST_MAKE_ENV+=		PATH='${TARGET_PATH}' \
+			CFLAGS='$(strip ${CFLAGS_FOR_BUILD})' \
+			CXXFLAGS='$(strip ${CXXFLAGS_FOR_BUILD})' \
+			CPPFLAGS='$(strip ${CPPFLAGS_FOR_BUILD})' \
+			LDFLAGS='$(strip ${LDFLAGS_FOR_BUILD})'
 HOST_MAKE_FLAGS+=	${HOST_XAKE_FLAGS} V=1
 HOST_FAKE_FLAGS+=	${HOST_XAKE_FLAGS}
 

+ 2 - 2
package/ncurses/Makefile

@@ -50,8 +50,8 @@ ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
 # use sth which does not exist
-HOST_ALL_TARGET:=	install.includes
-HOST_INSTALL_TARGET:=	install.progs
+HOST_ALL_TARGET:=	progs
+HOST_INSTALL_TARGET:=	install.includes install.progs
 HOST_CONFIGURE_ARGS+=	--without-shared \
 			--with-build-cc=${CC_FOR_BUILD} \
 			--with-progs \