diff options
| -rw-r--r-- | Config.in | 4 | ||||
| -rw-r--r-- | mk/build.mk | 18 | ||||
| -rw-r--r-- | package/cpio/Makefile | 4 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 14 | ||||
| -rwxr-xr-x | scripts/tar | 4 | ||||
| -rw-r--r-- | toolchain/gmp/Makefile | 3 | ||||
| -rw-r--r-- | toolchain/mpfr/Makefile | 2 |
7 files changed, 33 insertions, 16 deletions
@@ -119,6 +119,10 @@ config ADK_HOST_NETBSD prompt "NetBSD" boolean +config ADK_HOST_DARWIN + prompt "Darwin" + boolean + config ADK_HOST_CYGWIN prompt "Cygwin" boolean diff --git a/mk/build.mk b/mk/build.mk index 8a0e310f1..359569826 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -272,6 +272,9 @@ endif ifeq (${OStype},NetBSD) @echo ADK_HOST_NETBSD=y > $(TOPDIR)/.defconfig endif +ifeq (${OStype},Darwin) + @echo ADK_HOST_DARWIN=y > $(TOPDIR)/.defconfig +endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/.defconfig endif @@ -280,10 +283,10 @@ endif |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ - for symbol in ${DEFCONFIG}; do \ - echo $$symbol >> $(TOPDIR)/.defconfig; \ - done; \ fi + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/.defconfig; \ + done; \ @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ @@ -340,6 +343,9 @@ endif ifeq (${OStype},NetBSD) @echo ADK_HOST_NETBSD=y > $(TOPDIR)/all.config endif +ifeq (${OStype},Darwin) + @echo ADK_HOST_DARWIN=y > $(TOPDIR)/all.config +endif ifneq (,$(filter CYGWIN%,${OStype})) @echo ADK_HOST_CYGWIN=y > $(TOPDIR)/all.config endif @@ -348,10 +354,10 @@ endif |grep -i "$(TARGET)"\$$ \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ - for symbol in ${DEFCONFIG}; do \ - echo $$symbol >> $(TOPDIR)/all.config; \ - done; \ fi + for symbol in ${DEFCONFIG}; do \ + echo $$symbol >> $(TOPDIR)/all.config; \ + done; \ @if [ ! -z "$(FS)" ];then \ grep "^config" target/Config.in \ |grep -i "$(FS)" \ diff --git a/package/cpio/Makefile b/package/cpio/Makefile index 5bcbc2351..ed6b0b43f 100644 --- a/package/cpio/Makefile +++ b/package/cpio/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cpio -PKG_VERSION:= 2.10 +PKG_VERSION:= 2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 351ab3d38d8949913e478cc23b9d6ad4 +PKG_MD5SUM:= 1112bb6c45863468b5496ba128792f6c PKG_DESCR:= copies files into or out of a cpio archive PKG_SECTION:= net PKG_URL:= http://www.gnu.org/software/cpio/ diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 256104f2b..6d12c80e6 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -56,6 +56,12 @@ OpenBSD) # although some packages' autoconf scripts may # not properly recognise OpenBSD ;; +Darwin*) + echo "Building OpenADK on $os needs a case-sensitive disk partition." + echo "For Snow Leopard and above you can use diskutil to resize your existing disk." + echo "For older versions you might consider to use a disk image" + echo "Example: sudo diskutil resizeVolume disk0s2 90G 1 jhfsx adk 30G" + ;; *) # unsupported echo "Building OpenADK on $os is currently unsupported." @@ -105,9 +111,11 @@ fi if ! (tar --version | grep GNU) >/dev/null 2>&1;then if ! which gtar >/dev/null 2>&1; then - echo You must install GNU tar to continue. - echo - out=1 + if ! which gnutar >/dev/null 2>&1; then + echo You must install GNU tar to continue. + echo + out=1 + fi fi fi diff --git a/scripts/tar b/scripts/tar index 5d6db28b4..6f63d74c1 100755 --- a/scripts/tar +++ b/scripts/tar @@ -3,11 +3,15 @@ # material, please see the LICENCE file in the top-level directory. if [ -z "$(which gtar 2>/dev/null)" ];then + if [ -z "$(which gnutar 2>/dev/null)" ];then if [ -x /usr/bin/tar ];then /usr/bin/tar "$@" else /bin/tar "$@" fi + else + gnutar "$@" + fi else gtar "$@" fi diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 5b359b8cf..18dc3f83a 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -15,11 +15,8 @@ $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ --disable-shared \ --enable-static \ - --disable-nls \ ); touch $@ diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index 67753db9b..9feac6522 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -16,8 +16,6 @@ $(WRKBUILD)/.configured: (cd $(WRKBUILD); \ $(WRKBUILD)/configure \ --prefix=$(STAGING_TOOLS) \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_HOST_NAME) \ --with-gmp-build=$(GMP_BUILD_DIR) \ --disable-shared \ --enable-static \ |