diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/cfgfs/Makefile | 2 | ||||
| -rw-r--r-- | package/cfgfs/src/fwcf.sh | 4 | ||||
| -rw-r--r-- | package/glibc/Makefile | 28 |
3 files changed, 23 insertions, 11 deletions
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 70eb75a1f..a3af3dd62 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cfgfs PKG_VERSION:= 1.0.8 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_DESCR:= compressed config filesystem PKG_SECTION:= base PKG_URL:= http://openadk.org/ diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index ae2886d79..6f99393dd 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -163,7 +163,7 @@ if test $1 = setup; then mount --bind /etc /tmp/.cfgfs/root mkdir /tmp/.cfgfs/temp mount -t tmpfs none /tmp/.cfgfs/temp - (cd /tmp/.cfgfs/root; tar cf - .) | (cd /tmp/.cfgfs/temp; tar xpf -) + (cd /tmp/.cfgfs/root; tar cf - .) | (cd /tmp/.cfgfs/temp; tar xpf - 2>/dev/null) unclean=0 if [[ $1 = -N ]]; then unclean=2 @@ -247,7 +247,7 @@ if test $1 = commit; then [[ $1 = -f ]] || exit 7 fi mount -t tmpfs none /tmp/.cfgfs/temp - (cd /etc; tar cf - .) | (cd /tmp/.cfgfs/temp; tar xpf -) + (cd /etc; tar cf - .) | (cd /tmp/.cfgfs/temp; tar xpf - 2>/dev/null) cd /tmp/.cfgfs/temp find . -type f | grep -v -e '^./.cfgfs' -e '^./.rnd$' | sort | \ xargs md5sum | sed 's! ./! !' | \ diff --git a/package/glibc/Makefile b/package/glibc/Makefile index 4efecb946..6d9be792c 100644 --- a/package/glibc/Makefile +++ b/package/glibc/Makefile @@ -28,6 +28,18 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --enable-kernel="2.6.0" \ --enable-add-ons +GLIBC_ENV:= PATH='${TARGET_PATH}' \ + BUILD_CC=${HOSTCC} \ + CFLAGS="$(TARGET_CFLAGS)" \ + CC=${REAL_GNU_TARGET_NAME}-gcc \ + CXX=${REAL_GNU_TARGET_NAME}-g++ \ + AR=${REAL_GNU_TARGET_NAME}-ar \ + RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \ + libc_cv_forced_unwind=yes \ + libc_cv_c_cleanup=yes \ + libc_cv_gnu99_inline=yes \ + libc_cv_slibdir="/lib" + $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -64,18 +76,18 @@ glibc-dev-install: INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \ headers_install (cd $(WRKBUILD); \ - PATH='${TARGET_PATH}' \ + $(GLIBC_ENV) \ $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \ - --prefix=/usr \ - --with-sysroot=$(IDIR_GLIBC_DEV) \ - ${GLIBC_CONFOPTS} \ + --prefix=$(IDIR_GLIBC_DEV)/usr \ + --with-sysroot=$(IDIR_GLIBC_DEV) \ + ${GLIBC_CONFOPTS} \ ); - $(MAKE) -C $(WRKBUILD) \ - cross-compiling=yes \ - install_root=$(IDIR_GLIBC_DEV) \ - install-headers + $(GLIBC_ENV) $(MAKE) -C $(WRKBUILD) cross-compiling=yes install-headers touch $(IDIR_GLIBC_DEV)/usr/include/gnu/stubs.h touch $(IDIR_GLIBC_DEV)/usr/include/bits/stdio_lim.h + # WORKAROUND: bits/syscall.h is only installed via install-others target + $(CP) $(STAGING_DIR)/usr/include/bits/syscall.h \ + $(IDIR_GLIBC_DEV)/usr/include/bits @find $(IDIR_GLIBC_DEV) -name .install -exec rm {} \; include ${TOPDIR}/mk/pkg-bottom.mk |