Added an optional package DevelopmentPowerPC
* haiku-devlibs-ppc-gcc4 zip archive contains libroot and glue (but no stdc++). * fixed /boot/develop/lib/$arch symlink to point to the right dir instead of current. * setgcc now handles the ppc arch and updates the arch link /boot/develop/lib.
This commit is contained in:
@@ -14,6 +14,7 @@ OptionalPackageDependencies CDRecord : LibIconv ;
|
|||||||
OptionalPackageDependencies Curl : OpenSSL ;
|
OptionalPackageDependencies Curl : OpenSSL ;
|
||||||
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
|
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
|
||||||
OptionalPackageDependencies Development : DevelopmentBase Perl ;
|
OptionalPackageDependencies Development : DevelopmentBase Perl ;
|
||||||
|
OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ;
|
||||||
OptionalPackageDependencies GetText : LibIconv ;
|
OptionalPackageDependencies GetText : LibIconv ;
|
||||||
OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
|
OptionalPackageDependencies Git : Expat Curl OpenSSL LibIconv ;
|
||||||
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
|
OptionalPackageDependencies ICU-devel : DevelopmentBase ;
|
||||||
|
|||||||
@@ -41,6 +41,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
|||||||
# DevelopmentBase - basic development environment (gcc, headers, libs,...)
|
# DevelopmentBase - basic development environment (gcc, headers, libs,...)
|
||||||
# DevelopmentJava - JamVM, a Java Virtual machine, GNU Classpath, ECJ
|
# DevelopmentJava - JamVM, a Java Virtual machine, GNU Classpath, ECJ
|
||||||
# DevelopmentMin - development headers, libs, tools, from sources only
|
# DevelopmentMin - development headers, libs, tools, from sources only
|
||||||
|
# DevelopmentPowerPC - Cross compiling environment for PowerPC
|
||||||
# Doxygen - Generate documentation from source code
|
# Doxygen - Generate documentation from source code
|
||||||
# Expat - XML parsing libraries
|
# Expat - XML parsing libraries
|
||||||
# Fastdep - fast dependency generator for C/C++ files
|
# Fastdep - fast dependency generator for C/C++ files
|
||||||
@@ -744,7 +745,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
|||||||
|
|
||||||
# symlinks for ABI abstraction
|
# symlinks for ABI abstraction
|
||||||
AddSymlinkToHaikuImage develop abi : $(arch)/$(abi) : current ;
|
AddSymlinkToHaikuImage develop abi : $(arch)/$(abi) : current ;
|
||||||
AddSymlinkToHaikuImage develop lib : /boot/develop/abi/current/lib
|
AddSymlinkToHaikuImage develop lib : /boot/develop/abi/$(arch)/$(abi)/lib
|
||||||
: $(arch) ;
|
: $(arch) ;
|
||||||
AddSymlinkToHaikuImage develop tools
|
AddSymlinkToHaikuImage develop tools
|
||||||
: /boot/develop/abi/current/tools/current : gnupro ;
|
: /boot/develop/abi/current/tools/current : gnupro ;
|
||||||
@@ -803,6 +804,24 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# DevelopmentPowerPC
|
||||||
|
if [ IsOptionalHaikuImagePackageAdded DevelopmentPowerPC ] {
|
||||||
|
if $(TARGET_ARCH) != x86 {
|
||||||
|
Echo "No optional package DevelopmentPowerPC available for $(TARGET_ARCH)" ;
|
||||||
|
} else if $(HAIKU_GCC_VERSION[1]) < 4 && ! $(isHybridBuild) {
|
||||||
|
Echo "No optional package DevelopmentPowerPC available for gcc2" ;
|
||||||
|
} else {
|
||||||
|
InstallOptionalHaikuImagePackage
|
||||||
|
gcc-ppc-4.6.2-x86-gcc4-2012-03-17.zip
|
||||||
|
: $(baseURL)/gcc-ppc-4.6.2-x86-gcc4-2012-03-17.zip ;
|
||||||
|
InstallOptionalHaikuImagePackage
|
||||||
|
haiku-devlibs-ppc-gcc4-2012-03-18.zip
|
||||||
|
: $(baseURL)/haiku-devlibs-ppc-gcc4-2012-03-18.zip ;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
# DMIDecode
|
# DMIDecode
|
||||||
if [ IsOptionalHaikuImagePackageAdded DMIDecode ] {
|
if [ IsOptionalHaikuImagePackageAdded DMIDecode ] {
|
||||||
if $(TARGET_ARCH) != x86 {
|
if $(TARGET_ARCH) != x86 {
|
||||||
|
|||||||
+13
-4
@@ -2,8 +2,9 @@
|
|||||||
#
|
#
|
||||||
# setgcc [ <arch> ] [ <gcc> ]
|
# setgcc [ <arch> ] [ <gcc> ]
|
||||||
|
|
||||||
abiDir=/boot/develop/abi/
|
abiDir=/boot/develop/abi
|
||||||
abiLink=$abiDir/current
|
abiLink=$abiDir/current
|
||||||
|
libDir=/boot/develop/lib
|
||||||
|
|
||||||
usage()
|
usage()
|
||||||
{
|
{
|
||||||
@@ -13,7 +14,7 @@ Usage: $0 [ <arch> ] [ <gcc> ]
|
|||||||
Sets the current gcc version, respectively prints it, if no arguments are
|
Sets the current gcc version, respectively prints it, if no arguments are
|
||||||
given.
|
given.
|
||||||
|
|
||||||
<arch> - The architecture to set. Supported values: "x86".
|
<arch> - The architecture to set. Supported values: "x86", "ppc".
|
||||||
<gcc> - The major gcc version to set. Supported values: "gcc2", "gcc4".
|
<gcc> - The major gcc version to set. Supported values: "gcc2", "gcc4".
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
@@ -46,6 +47,7 @@ while [ $# -gt 0 ]; do
|
|||||||
case $1 in
|
case $1 in
|
||||||
-h,--help) usage; exit;;
|
-h,--help) usage; exit;;
|
||||||
x86) arch=$1;;
|
x86) arch=$1;;
|
||||||
|
ppc) arch=$1;;
|
||||||
gcc2|gcc4) gcc=$1;;
|
gcc2|gcc4) gcc=$1;;
|
||||||
*) usage; exit 1;;
|
*) usage; exit 1;;
|
||||||
esac
|
esac
|
||||||
@@ -76,8 +78,8 @@ if [ -z "$gcc" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check whether the gcc exits
|
# check whether the gcc exists
|
||||||
if [ ! -e $abiDir/$arch/$gcc/tools/current/bin/gcc ]; then
|
if [ ! -e $abiDir/$arch/$gcc/tools/current/bin/*gcc ]; then
|
||||||
echo "Can't set GCC $arch/$gcc -- not installed." >&2
|
echo "Can't set GCC $arch/$gcc -- not installed." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -87,3 +89,10 @@ fi
|
|||||||
echo "Failed to set GCC $arch/$gcc." >&2
|
echo "Failed to set GCC $arch/$gcc." >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# create the lib symlink
|
||||||
|
libLink=$libDir/$arch
|
||||||
|
( rm -f $libLink && ln -sf $abiDir/$arch/$gcc/lib $libLink ) || {
|
||||||
|
echo "Failed to set lib $arch/$gcc." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user