i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch by Matt Madia: detect host sfdisk in configure for ARM, including the FreeBSD port.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-01-07 22:08:12 +00:00
parent 987acd111b
commit c505b2765b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+11
View File
@@ -293,6 +293,8 @@ HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR=
HAIKU_ADD_ALTERNATIVE_GCC_LIBS= HAIKU_ADD_ALTERNATIVE_GCC_LIBS=
HOST_GCC_LD=`gcc -print-prog-name=ld` HOST_GCC_LD=`gcc -print-prog-name=ld`
HOST_GCC_OBJCOPY=`gcc -print-prog-name=objcopy` HOST_GCC_OBJCOPY=`gcc -print-prog-name=objcopy`
SFDISK_BINARY=sfdisk
HOST_SFDISK=$SFDISK_BINARY
haikuRequiredLegacyGCCVersion="2.95.3-haiku-090629" haikuRequiredLegacyGCCVersion="2.95.3-haiku-090629"
export haikuRequiredLegacyGCCVersion export haikuRequiredLegacyGCCVersion
@@ -415,6 +417,7 @@ case "${platform}" in
;; ;;
Darwin) HOST_PLATFORM=darwin ;; Darwin) HOST_PLATFORM=darwin ;;
FreeBSD) HOST_PLATFORM=freebsd FreeBSD) HOST_PLATFORM=freebsd
SFDISK_BINARY=sfdisk-linux
if [ "$HAIKU_USE_32BIT" = 1 ] ; then if [ "$HAIKU_USE_32BIT" = 1 ] ; then
echo Unsupported platform: FreeBSD ${platformMachine} echo Unsupported platform: FreeBSD ${platformMachine}
exit 1 exit 1
@@ -451,6 +454,13 @@ if [ $targetArch = "x86" ]; then
fi fi
fi fi
# check common locations for sfdisk
for sfdiskDir in /sbin /usr/sbin /usr/local/sbin ; do
if [ -e ${sfdiskDir}/${SFDISK_BINARY} ]; then
HOST_SFDISK=${sfdiskDir}/${SFDISK_BINARY}
fi
done
# check for case-sensitive filesystem if on darwin # check for case-sensitive filesystem if on darwin
if [ $HOST_PLATFORM = "darwin" ]; then if [ $HOST_PLATFORM = "darwin" ]; then
diskutil info $(pwd) | grep -i "case-sensitive" > /dev/null diskutil info $(pwd) | grep -i "case-sensitive" > /dev/null
@@ -546,6 +556,7 @@ HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ;
HOST_GCC_MACHINE ?= ${HOST_GCC_MACHINE} ; HOST_GCC_MACHINE ?= ${HOST_GCC_MACHINE} ;
HOST_LD ?= ${HOST_GCC_LD} ; HOST_LD ?= ${HOST_GCC_LD} ;
HOST_OBJCOPY ?= ${HOST_GCC_OBJCOPY} ; HOST_OBJCOPY ?= ${HOST_GCC_OBJCOPY} ;
HOST_SFDISK ?= ${HOST_SFDISK} ;
EOF EOF
src/system/boot/platform/u-boot/Jamfile
+1 -1
View File
@@ -144,7 +144,7 @@ rule BuildUBootSDImage image : files
Depends $(image) : $(files) ; Depends $(image) : $(files) ;
SDIMAGE_BLOCK_SIZE on $(image) = 1M ; SDIMAGE_BLOCK_SIZE on $(image) = 1M ;
SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ; SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ;
SDIMAGE_FDISK on $(image) = /sbin/sfdisk ; SDIMAGE_FDISK on $(image) = $(HOST_SFDISK) ;
SDIMAGE_FDISK_SCRIPT on $(image) = SDIMAGE_FDISK_SCRIPT on $(image) =
"0,$(HAIKU_BOARD_SDIMAGE_FAT_SIZE),0c,-\\\n,,eb\\\n\\\n" ; "0,$(HAIKU_BOARD_SDIMAGE_FAT_SIZE),0c,-\\\n,,eb\\\n\\\n" ;
SDIMAGE_FDISK_H on $(image) = 255 ; SDIMAGE_FDISK_H on $(image) = 255 ;