mirror of
https://github.com/Relintai/osxcross.git
synced 2025-02-03 22:45:56 +01:00
misc freebsd fixes:
add tgmath.h intrinsic header file (required for the 10.10 sdk) osxcross-macports: pass --ca-certificate=[...]/ca-root-nss.crt to wget
This commit is contained in:
parent
d6e191f24c
commit
873ba3df94
5
build.sh
5
build.sh
@ -225,7 +225,7 @@ if [ $NEED_XAR -ne 0 ]; then
|
|||||||
extract $TARBALL_DIR/xar*.tar.gz 2
|
extract $TARBALL_DIR/xar*.tar.gz 2
|
||||||
|
|
||||||
pushd xar* &>/dev/null
|
pushd xar* &>/dev/null
|
||||||
test "`uname -s`" = "NetBSD" && patch -p0 -l < $PATCH_DIR/xar-netbsd.patch
|
[ $PLATFORM == "NetBSD" ] && patch -p0 -l < $PATCH_DIR/xar-netbsd.patch
|
||||||
CFLAGS+=" -w" ./configure --prefix=$TARGET_DIR
|
CFLAGS+=" -w" ./configure --prefix=$TARGET_DIR
|
||||||
$MAKE -j$JOBS
|
$MAKE -j$JOBS
|
||||||
$MAKE install -j$JOBS
|
$MAKE install -j$JOBS
|
||||||
@ -287,7 +287,8 @@ set +e
|
|||||||
ln -s \
|
ln -s \
|
||||||
$SDK_DIR/MacOSX$SDK_VERSION.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/std*.h \
|
$SDK_DIR/MacOSX$SDK_VERSION.sdk/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/std*.h \
|
||||||
usr/include 2>/dev/null
|
usr/include 2>/dev/null
|
||||||
test ! -f "usr/include/float.h" && cp -f $BASE_DIR/oclang/quirks/float.h usr/include
|
[ ! -f "usr/include/float.h" ] && cp -f $BASE_DIR/oclang/quirks/float.h usr/include
|
||||||
|
[ $PLATFORM == "FreeBSD" ] && cp -f $BASE_DIR/oclang/quirks/tgmath.h usr/include
|
||||||
set -e
|
set -e
|
||||||
popd &>/dev/null
|
popd &>/dev/null
|
||||||
|
|
||||||
|
1374
oclang/quirks/tgmath.h
Normal file
1374
oclang/quirks/tgmath.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -24,6 +24,13 @@ PUBKEYURL+="macports/trunk/base/macports-pubkey.pem"
|
|||||||
PUBKEYRMD160="d3a22f5be7184d6575afcc1be6fdb82fd25562e8"
|
PUBKEYRMD160="d3a22f5be7184d6575afcc1be6fdb82fd25562e8"
|
||||||
PUBKEYSHA1="214baa965af76ff71187e6c1ac91c559547f48ab"
|
PUBKEYSHA1="214baa965af76ff71187e6c1ac91c559547f48ab"
|
||||||
|
|
||||||
|
PLATFORM=$(uname -s)
|
||||||
|
|
||||||
|
if [ $PLATFORM == "FreeBSD" ]; then
|
||||||
|
WGETOPTS="--ca-certificate="
|
||||||
|
WGETOPTS+="/usr/local/share/certs/ca-root-nss.crt"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -n "$OSXCROSS_MACPORTS_ENABLE_HTTPS" ]; then
|
if [ -n "$OSXCROSS_MACPORTS_ENABLE_HTTPS" ]; then
|
||||||
MIRROR=$(echo $MIRROR | sed 's/http:/https:/g')
|
MIRROR=$(echo $MIRROR | sed 's/http:/https:/g')
|
||||||
fi
|
fi
|
||||||
@ -62,8 +69,6 @@ require()
|
|||||||
set -e
|
set -e
|
||||||
}
|
}
|
||||||
|
|
||||||
PLATFORM=$(uname -s)
|
|
||||||
|
|
||||||
if [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
|
if [ -z "$MACOSX_DEPLOYMENT_TARGET" ]; then
|
||||||
errorMsg "You must set MACOSX_DEPLOYMENT_TARGET first."
|
errorMsg "You must set MACOSX_DEPLOYMENT_TARGET first."
|
||||||
errorMsg "Please see README.MACPORTS."
|
errorMsg "Please see README.MACPORTS."
|
||||||
@ -147,7 +152,7 @@ getFileStdout()
|
|||||||
verbosePlaceHolder
|
verbosePlaceHolder
|
||||||
local xargs=""
|
local xargs=""
|
||||||
[ -z "$VERBOSE" ] && xargs+="--quiet"
|
[ -z "$VERBOSE" ] && xargs+="--quiet"
|
||||||
wget "$1" -O- $xargs
|
wget $WGETOPTS "$1" -O- $xargs
|
||||||
#verbosePlaceHolder
|
#verbosePlaceHolder
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -161,7 +166,7 @@ getFile()
|
|||||||
xargs+="-P $CACHE "
|
xargs+="-P $CACHE "
|
||||||
fi
|
fi
|
||||||
[ -z "$VERBOSE" ] && xargs+="--quiet"
|
[ -z "$VERBOSE" ] && xargs+="--quiet"
|
||||||
wget -c "$1" $xargs
|
wget $WGETOPTS -c "$1" $xargs
|
||||||
#verbosePlaceHolder
|
#verbosePlaceHolder
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user