diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-01 15:26:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-01 15:26:49 +0100 |
| commit | 0e19731bdf514eabf6a31ece3d4f59c84c11f3a2 (patch) | |
| tree | 4f967f08fe59b3f5c4acf2e0d82d15c564f8d773 /mk | |
| parent | caec12548668dd7dd564ce732d8c77a76dfe4788 (diff) | |
allow gettext-tiny host compile with HOST_STYLE=manual
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index ecab37775..4f4dbf3c5 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -20,6 +20,7 @@ ${_HOST_CONFIGURE_COOKIE}: ${_HOST_PATCH_COOKIE} ${CP} ${SCRIPT_DIR}/config.guess $$i; \ fi; \ done; +ifneq (${HOST_STYLE},manual) ifeq ($(strip ${HOST_STYLE}),) cd ${WRKBUILD}; rm -f config.{cache,status}; \ env ${HOST_CONFIGURE_ENV} \ @@ -54,6 +55,7 @@ else --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif +endif touch $@ host-build: @@ -67,6 +69,7 @@ hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @$(CMD_TRACE) "host installing... " +ifneq (${HOST_STYLE},manual) 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) @@ -75,6 +78,9 @@ else cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif +else + env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) +endif rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} diff --git a/mk/vars.mk b/mk/vars.mk index dad3d939a..93a9a5988 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -142,10 +142,10 @@ CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags CXX_FOR_BUILD?= g++ -CPPFLAGS_FOR_BUILD?= +CPPFLAGS_FOR_BUILD?= -I$(STAGING_HOST_DIR)/usr/include CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall -LDFLAGS_FOR_BUILD?= +LDFLAGS_FOR_BUILD?= -L/opt/local/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh |