diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/host-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 3 | ||||
| -rw-r--r-- | mk/vars.mk | 6 |
5 files changed, 11 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index b44247005..a025b1396 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -172,7 +172,7 @@ endif ${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_HOST_DIR}: mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \ - ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib} + ${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include} ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) 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/pkg-bottom.mk b/mk/pkg-bottom.mk index 34e5405a8..782a91284 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -17,6 +17,9 @@ pre-configure: do-configure: post-configure: ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE} +ifneq (,$(filter autoconf,${AUTOTOOL_STYLE})) + cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoconf $(MAKE_TRACE) +endif ifneq (,$(filter autoreconf,${AUTOTOOL_STYLE})) cd ${WRKSRC}; env ${AUTOTOOL_ENV} autoreconf -if $(MAKE_TRACE) @rm -rf ${WRKSRC}/autom4te.cache diff --git a/mk/vars.mk b/mk/vars.mk index 93a9a5988..bb7bd52b9 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -130,6 +130,8 @@ TARGET_CFLAGS+= -g3 -fno-omit-frame-pointer else TARGET_CPPFLAGS+= -DNDEBUG TARGET_CFLAGS+= -fomit-frame-pointer $(TARGET_OPTIMIZATION) +# stop generating eh_frame stuff +TARGET_CFLAGS+= -fno-unwind-tables -fno-asynchronous-unwind-tables endif @@ -145,7 +147,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 @@ -201,7 +203,7 @@ endif ifeq ($(ADK_NATIVE),y) RSTRIP:= prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh else -RSTRIP:= prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh +RSTRIP:= PATH="$(TARGET_PATH)" prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh endif STATCMD:=$(shell if stat -qs .>/dev/null 2>&1; then echo 'stat -f %z';else echo 'stat -c %s';fi) |