From d0b6f8e1935a44e8ef154758b927d6431717d035 Mon Sep 17 00:00:00 2001
From: Axel Dörfler <axeld@pinc-software.de>
Date: Thu, 26 Aug 2010 14:10:40 +0000
Subject: [PATCH] * The script should now build working gcc2 packages.


git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@38375 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build-gcc2-optional-package-Haiku.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build-gcc2-optional-package-Haiku.sh b/build-gcc2-optional-package-Haiku.sh
index 1d0cfb1..87b33fc 100755
--- a/build-gcc2-optional-package-Haiku.sh
+++ b/build-gcc2-optional-package-Haiku.sh
@@ -25,6 +25,7 @@
 	GCCDATE=$1
 fi
 
+current_dir=$(pwd)
 base=/boot/develop/abi/x86/gcc2/tools/gcc-2.95.3-haiku-$GCCDATE
 if [ ! -d "$base" ]; then
 	echo GCC directory \"$base\" does not exist!
@@ -46,10 +47,12 @@
 	cd $html_base
 
 	makeinfo --html $gcc_base/../gcc/gcc/cpp.texi
+	makeinfo --html $gcc_base/../gcc/gcc/gcc.texi
 	makeinfo --html $gcc_base/../binutils/libiberty/libiberty.texi
 	makeinfo --force --html $gcc_base/../gcc/libio/iostream.texi
 
 	ln -sf cpp/index.html $html_base/cpp.html
+	ln -sf gcc/index.html $html_base/gcc.html
 	ln -sf libiberty/index.html $html_base/libiberty.html
 	ln -sf iostream/index.html $html_base/iostream.html
 fi
@@ -73,27 +76,26 @@
 fi
 
 if [ -d $base/man -o -d $base/info -o -d $base/share ]; then
-	echo "Removing legacy documentation (man/info/share)..."
+	echo "Removing legacy files (man/info/share)..."
 	rm -rf $base/man
 	rm -rf $base/info
 	rm -rf $base/share
 fi
+rm -f $base/lib/gcc-lib/i586-pc-haiku/2.95.3-haiku-$GCCDATE/include/math.h
 
 
-### C++ includes/lib ######################################
+### C++ includes ######################################
 
-echo "Install C++ includes and library"
+echo "Install C++ includes"
 
 rm -rf $base/include/g++
 ln -snf /boot/develop/headers/cpp $base/include/g++
-ln -sf /system/lib/libstdc++.r4.so $base/lib/
 
 
 ### zip archive ###########################################
 
 echo "Building ZIP archive..."
 
-current_dir=$(pwd)
 current_gcc=$(setgcc | cut -d/ -f 2)
 version_year=20$(echo $GCCDATE | cut -c1-2)
 version_month=$(echo $GCCDATE | cut -c3-4)
@@ -101,8 +103,9 @@
 zip_name="$current_dir/gcc-2.95.3-x86-$current_gcc-$version_year-$version_month-$version_day.zip"
 
 cd /boot
+zip_base=$(echo $base | cut -d/ -f3-)
 rm -f $zip_name
-zip -yr $zip_name $base
+zip -yr $zip_name $zip_base
 
 current_name=develop/abi/x86/gcc2/tools/current
 ln -snf gcc-2.95.3-haiku-$GCCDATE $current_name
--
gitore 0.2.2