mirror of
https://github.com/Relintai/osxcross.git
synced 2025-02-03 22:45:56 +01:00
Misc 'osxcross-macports' fixes
This commit is contained in:
parent
5702a9ab39
commit
6f603a9c0a
@ -81,9 +81,8 @@ case $MACOSX_DEPLOYMENT_TARGET in
|
|||||||
10.8* ) OSXVERSION="darwin_12" ;;
|
10.8* ) OSXVERSION="darwin_12" ;;
|
||||||
10.9* ) OSXVERSION="darwin_13" ;;
|
10.9* ) OSXVERSION="darwin_13" ;;
|
||||||
10.10* ) OSXVERSION="darwin_14" ;;
|
10.10* ) OSXVERSION="darwin_14" ;;
|
||||||
# "Downgrade" 10.11 to 10.10 until
|
10.11* ) OSXVERSION="darwin_15" ;;
|
||||||
# there are packages for 10.11
|
10.12* ) OSXVERSION="darwin_16" ;;
|
||||||
10.11* ) OSXVERSION="darwin_14" ;;
|
|
||||||
* ) unsupportedDepTarget ;;
|
* ) unsupportedDepTarget ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
@ -307,7 +306,7 @@ installPkg()
|
|||||||
LASTPKGNAME=$pkgname
|
LASTPKGNAME=$pkgname
|
||||||
|
|
||||||
if [ $(pkgInstalled $pkgname) -eq 1 ]; then
|
if [ $(pkgInstalled $pkgname) -eq 1 ]; then
|
||||||
continue
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "searching package $pkgname ..."
|
echo "searching package $pkgname ..."
|
||||||
@ -348,8 +347,8 @@ installPkg()
|
|||||||
|
|
||||||
if [ -d opt/local ]; then
|
if [ -d opt/local ]; then
|
||||||
verboseMsg " fixing permissions ..."
|
verboseMsg " fixing permissions ..."
|
||||||
find opt/local -type d -exec chmod 770 {} \;
|
find opt/local -type d -exec chmod 755 {} \;
|
||||||
find opt/local -type f -exec chmod 660 {} \;
|
find opt/local -type f -exec chmod 644 {} \;
|
||||||
if [ -d opt/local/lib ]; then
|
if [ -d opt/local/lib ]; then
|
||||||
if [ -n "$STATIC" ]; then
|
if [ -n "$STATIC" ]; then
|
||||||
verboseMsg " "
|
verboseMsg " "
|
||||||
@ -359,6 +358,9 @@ installPkg()
|
|||||||
find opt/local/lib -type f -name "*.dylib" -exec chmod +x {} \;
|
find opt/local/lib -type f -name "*.dylib" -exec chmod +x {} \;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
if [ -d opt/local/bin ]; then
|
||||||
|
find opt/local/bin -type f -exec chmod +x {} \;
|
||||||
|
fi
|
||||||
set +e
|
set +e
|
||||||
cp -r opt $INSTALL
|
cp -r opt $INSTALL
|
||||||
local status=$?
|
local status=$?
|
||||||
|
Loading…
Reference in New Issue
Block a user