[haiku-commits] r39406 - buildtools/trunk
- From: ingo_weinhold@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 11 Nov 2010 23:47:19 +0100 (CET)
Author: bonefish
Date: 2010-11-11 23:47:18 +0100 (Thu, 11 Nov 2010)
New Revision: 39406
Changeset: http://dev.haiku-os.org/changeset/39406
Modified:
buildtools/trunk/build-gcc4-optional-package-Haiku.sh
Log:
* Add an include/g++ symlink in the package. Apparently it isn't created by
"make install" anymore.
* Add the "current" symlink in the ".../tools" directory.
Modified: buildtools/trunk/build-gcc4-optional-package-Haiku.sh
===================================================================
--- buildtools/trunk/build-gcc4-optional-package-Haiku.sh 2010-11-11
21:33:22 UTC (rev 39405)
+++ buildtools/trunk/build-gcc4-optional-package-Haiku.sh 2010-11-11
22:47:18 UTC (rev 39406)
@@ -54,7 +54,9 @@
exit 1
fi
+gccVersionedName=gcc-${gccVersion}-haiku-${gccDate}
+
# get the architecture
gccArch=`uname -m`
case $gccArch in
@@ -64,7 +66,7 @@
# check whether the installation dir does already exit
-installDir=/boot/develop/abi/$gccArch/gcc4/tools/gcc-${gccVersion}-haiku-${gccDate}
+installDir=/boot/develop/abi/$gccArch/gcc4/tools/$gccVersionedName
if [ -e "$installDir" ]; then
echo "The installation directory '$installDir' does already exist." >&2
echo "Remove it first." >&2
@@ -117,6 +119,10 @@
"$installDir/lib/libstdc++.so"
+# add C++ header symlink
+ln -s c++/$gccVersion $installDir/include/g++
+
+
# zip everything up
gccVersionYear=20$(echo $GCCDATE | cut -c1-2)
gccVersionMonth=$(echo $GCCDATE | cut -c3-4)
@@ -127,6 +133,13 @@
zip -ry "$packageFile" `echo $installDir | cut -d/ -f3-`
+# add the "current" version symlink
+cd "$buildDir"
+mkdir -p develop/abi/x86/gcc4/tools/
+ln -s $gccVersionedName develop/abi/x86/gcc4/tools/current
+zip -y "$packageFile" develop/abi/x86/gcc4/tools/current
+
+
# add the optional package description
cd "$buildDir"
echo "Package: GCC
Other related posts:
- » [haiku-commits] r39406 - buildtools/trunk - ingo_weinhold
