diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-29 21:05:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-29 21:05:04 +0100 |
| commit | a852b043567e2f161899dfcc28ab080bcfe4ec66 (patch) | |
| tree | d5415486efc03e90c0aad0ad1a9b4d3f82a30874 | |
| parent | 380a9453447f1be08fc61ffbc92c0fc5f4f10c53 (diff) | |
try to fix ncurses build on buildserver
| -rw-r--r-- | mk/host-bottom.mk | 36 | ||||
| -rw-r--r-- | mk/host.mk | 5 | ||||
| -rw-r--r-- | package/ncurses/Makefile | 4 |
3 files changed, 25 insertions, 20 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index dab1bd99b..d6ec200c2 100644 --- a/mk/host-bottom.mk +++ b/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) diff --git a/mk/host.mk b/mk/host.mk index 855adf0d1..619ec140e 100644 --- a/mk/host.mk +++ b/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} diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 4c649aff0..fb3a39eb5 100644 --- a/package/ncurses/Makefile +++ b/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 \ |