diff options
| -rw-r--r-- | package/base-files/src/etc/rc.shutdown | 5 | ||||
| -rw-r--r-- | package/glib/Makefile | 15 | ||||
| -rwxr-xr-x | scripts/tar | 6 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 2 |
4 files changed, 11 insertions, 17 deletions
diff --git a/package/base-files/src/etc/rc.shutdown b/package/base-files/src/etc/rc.shutdown index 381669a57..8716dc59e 100644 --- a/package/base-files/src/etc/rc.shutdown +++ b/package/base-files/src/etc/rc.shutdown @@ -1,5 +1,6 @@ #!/bin/sh +cd / +sync for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }');do - printf Unmounting $i - umount $i + umount $i 2>/dev/null done diff --git a/package/glib/Makefile b/package/glib/Makefile index a5df0225f..3ee7190d0 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib PKG_VERSION:= 2.28.1 PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs @@ -42,19 +42,6 @@ CONFIGURE_ENV+= glib_cv_long_long_format=ll \ ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getgrgid_r=yes -pre-configure: -ifneq ($(OStype),FreeBSD) - (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ - CFLAGS="-L/usr/local/lib" ./configure --prefix=$(STAGING_HOST_DIR) \ - --with-libiconv=gnu \ - ) - ${MAKE} -C ${WRKBUILD} V=1 - $(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin - $(CP) ${WRKBUILD}/gobject/glib-mkenums ${STAGING_HOST_DIR}/bin - ${MAKE} -C ${WRKBUILD} clean -endif - glib-install: ${INSTALL_DIR} ${IDIR_GLIB}/usr/lib ${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib diff --git a/scripts/tar b/scripts/tar index 60c5057da..b696d5b92 100755 --- a/scripts/tar +++ b/scripts/tar @@ -3,7 +3,11 @@ # material, please see the LICENCE file in the top-level directory. if [ -z "$(which gtar 2>/dev/null)" ];then - /bin/tar "$@" + if [ -x /bin/tar ];then + /bin/tar "$@" + else + /usr/bin/tar "$@" + fi else gtar "$@" fi diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 202709540..fb9e7425e 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -12,7 +12,9 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: +ifneq ($(OStype),Darwin) (cd $(WRKBUILD); cp configfsf.guess config.guess) +endif (cd $(WRKBUILD); \ ./configure \ --prefix=$(STAGING_HOST_DIR) \ |