diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-02 12:03:09 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-02 12:03:09 +0100 |
| commit | fbe47cba997e4f2f2dbaa6af0583dbec2e5d130c (patch) | |
| tree | 63aa5fb4d8c8ad7e63aeaad50e5701a2918dbedd /mk | |
| parent | 216fc3f63dcf07f5bc644165ce1965d733330de0 (diff) | |
remove dependencies to libiconv,pkg-config and file. use pkgconf and libiconv-tiny instead. fixes glib compile on systems without libiconv/ native iconv implementation
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/host-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 4f4dbf3c5..441eefb3e 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -65,6 +65,7 @@ ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) touch $@ +hostpost-install: hpkg-install: ${ALL_HOSTINST} host-install: ${_HOST_FAKE_COOKIE}: ${_HOST_BUILD_COOKIE} @@ -81,6 +82,7 @@ endif else env ${HOST_MAKE_ENV} ${MAKE} hpkg-install $(MAKE_TRACE) endif + env ${HOST_MAKE_ENV} ${MAKE} hostpost-install $(MAKE_TRACE) rm -rf ${WRKBUILD} ${WRKDIST} ${WRKSRC} exec ${MAKE} host-extract $(MAKE_TRACE) mkdir -p ${HOST_WRKINST} diff --git a/mk/image.mk b/mk/image.mk index ae5e55f98..0ce61cd01 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -189,7 +189,7 @@ ifeq ($(ADK_KERNEL_COMP_BZIP2),y) echo "CONFIG_RD_BZIP2=y" >> ${LINUX_DIR}/.config echo "CONFIG_INITRAMFS_COMPRESSION_BZIP2=y" >> ${LINUX_DIR}/.config endif - @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* $(MAKE_TRACE) + @-rm $(LINUX_DIR)/usr/initramfs_data.cpio* 2>/dev/null echo N | \ $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH=$(ARCH) CC="$(TARGET_CC)" -j${ADK_MAKE_JOBS} oldconfig $(MAKE_TRACE) diff --git a/mk/vars.mk b/mk/vars.mk index 93a9a5988..7d58fc8ef 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -145,7 +145,7 @@ CXX_FOR_BUILD?= g++ 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?= -L/opt/local/lib +LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh |