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

Determine how to invoke sed with extended regexp

Browse Source 
This will require re-running configure
This commit is contained in:
Niels Sascha Reedijk
2013-09-30 21:41:54 +02:00
parent a69102a1f3
commit f04f7042c5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+2 -1
View File
@@ -454,7 +454,8 @@ rule DownloadFile file : url : source
actions ChecksumFileSHA256 actions ChecksumFileSHA256
{ {
$(HOST_SHA256) $(2) | sed -r 's,([^[:space:]]*).*,\1,' > $(1) $(HOST_SHA256) $(2) \
| $(HOST_EXTENDED_REGEX_SED) 's,([^[:space:]]*).*,\1,' > $(1)
# The sed part is only necessary for sha256sum, but it doesn't harm for # The sed part is only necessary for sha256sum, but it doesn't harm for
# sha256 either. # sha256 either.
} }
configure
Vendored
+7
View File
@@ -465,6 +465,7 @@ HAIKU_HOST_USE_32BIT=0
HAIKU_HOST_USE_XATTR=0 HAIKU_HOST_USE_XATTR=0
HAIKU_HOST_USE_XATTR_REF=0 HAIKU_HOST_USE_XATTR_REF=0
HAIKU_HOST_BUILD_ONLY=0 HAIKU_HOST_BUILD_ONLY=0
HOST_EXTENDED_REGEX_SED="sed -r"
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 SFDISK_BINARY=sfdisk
@@ -663,6 +664,11 @@ if [ $caseInsensitive != 0 ]; then
exit 1 exit 1
fi fi
# determine how to invoke sed with extended regexp support for non-GNU sed
if [ $HOST_PLATFORM = "darwin" ]; then
HOST_EXTENDED_REGEX_SED="sed -E"
fi
# create output directory # create output directory
mkdir -p "$buildOutputDir" || exit 1 mkdir -p "$buildOutputDir" || exit 1
@@ -858,6 +864,7 @@ HAIKU_BUILD_ATTRIBUTES_DIR ?= ${HAIKU_BUILD_ATTRIBUTES_DIR} ;
HAIKU_YASM ?= ${HAIKU_YASM} ; HAIKU_YASM ?= ${HAIKU_YASM} ;
HOST_EXTENDED_REGEX_SED ?= ${HOST_EXTENDED_REGEX_SED} ;
HOST_GCC_RAW_VERSION ?= ${HOST_GCC_RAW_VERSION} ; 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} ;