Ticket #5617: gcc295-create-proper-libstdc-symlink.patch

build/jam/HaikuImage

@@ -655 +655 @@
         cd $(DIRECTORY)
         export HAIKU_IGNORE_USER_BUILD_CONFIG=1
         export HAIKU_ADD_OPTIONAL_PACKAGES=$(OPTIONAL_PACKAGES)
+        export HAIKU_ALTERNATIVE_JAM_PROCESS=1
         $(JAM:E=jam) -q $(COMMAND_LINE) ;
     }
 

build/jam/OptionalPackages

@@ -404 +404 @@
         && $(TARGET_ARCH) = x86 {
     # gcc and binutils
     if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) {
-        InstallOptionalHaikuImagePackage gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip
-            : $(baseURL)/gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ;
+        InstallOptionalHaikuImagePackage new-gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip
+            : $(baseURL)/new-gcc-2.95.3-r1a1-x86-gcc2-2009-08-26.zip ;
+        if $(HAIKU_GCC_VERSION[1]) = 2 && ! $(HAIKU_ALTERNATIVE_JAM_PROCESS) {
+            # create symlink in base image
+            AddSymlinkToHaikuImage
+                develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
+                : /system/lib/libstdc++.r4.so ;
+        } else if $(HAIKU_GCC_VERSION[1]) = 2 && $(HAIKU_ALTERNATIVE_JAM_PROCESS) {
+            # create symlink in hybrid image
+            AddSymlinkToHaikuHybridImage
+                develop abi x86 gcc2 tools gcc-2.95.3-haiku-090629 lib
+                : /system/lib/gcc2/libstdc++.r4.so ;
+        }
     }
 
     if $(HAIKU_GCC_VERSION[1]) = 4 || $(isHybridBuild) {
@@ -819 +830 @@
     if $(TARGET_ARCH) != x86 {
         Echo "No optional package OpenSSH available for $(TARGET_ARCH)" ;
     } else {
-        if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
+        if ! $(HAIKU_IMAGE_HOST_NAME) && ! $(HAIKU_ALTERNATIVE_JAM_PROCESS) {
             Exit "Optional package OpenSSH requires the HAIKU_IMAGE_HOST_NAME"
                 "variable to be set!" ;
         }