[haiku-commits] Re: r35746 - haiku/trunk/build/jam

  • From: Matt Madia <mattmadia@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 26 Mar 2010 03:26:40 -0400

On Wed, Mar 3, 2010 at 17:44,  <zooey@xxxxxxxxxxxxxxx> wrote:
> Author: zooey
> Date: 2010-03-03 22:44:12 +0100 (Wed, 03 Mar 2010)
> New Revision: 35746
> Changeset: http://dev.haiku-os.org/changeset/35746/haiku
> Ticket: http://dev.haiku-os.org/ticket/5518
>
> Modified:
>   haiku/trunk/build/jam/OptionalPackages
> Log:
> Fixing #5518:
> * applied Matt's patch (somewhat changed) that corrects the links for gcc4's
>  libstdc++.so and libsupc++.so in case of a gcc2 hybrid (they must point
>  to /system/lib/gcc4/... instead of /system/lib/...)
>
>
> Modified: haiku/trunk/build/jam/OptionalPackages
> ===================================================================
> --- haiku/trunk/build/jam/OptionalPackages      2010-03-03 21:02:34 UTC (rev 
> 35745)
> +++ haiku/trunk/build/jam/OptionalPackages      2010-03-03 21:44:12 UTC (rev 
> 35746)
> @@ -400,6 +400,14 @@
>                # symlink cpp to g++'s headers
>                AddSymlinkToHaikuImage develop abi x86 gcc4 headers
>                        : ../tools/current/include/g++ : cpp ;
> +

> +               # symlink to the appropriate system/lib[/gcc4] folder
> +               local libs = libstdc++.so libsupc++.so ;
> +               for lib in $(libs) {
> +                       AddSymlinkToHaikuHybridImage
> +                               develop abi x86 gcc4 tools 
> gcc-4.3.3-haiku-090629 lib
> +                               : /system/lib $(lib) : : true ;
> +               }
>        }
>
>        # other commonly used tools

I don't think this fixed the symlinks on gcc4hybrids
{{{
/Haiku1> ls system/lib/libs*.so
system/lib/libscreensaver.so  system/lib/libstdc++.so  system/lib/libsupc++.so

/Haiku1> ls system/lib/gcc2/libs*.so
system/lib/gcc2/libscreensaver.so  system/lib/gcc2/libsocket.so
system/lib/gcc2/libstdc++.r4.so

/Haiku1> ls -l develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/*.so
<snip> develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/libstdc++.so
-> /system/lib/gcc2/libstdc++.so
<snip> develop/abi/x86/gcc4/tools/gcc-4.3.3-haiku-090629/lib/libsupc++.so
-> /system/lib/gcc2/libsupc++.so
}}}


Should I just go ahead and commit this or re-open #5518?

=-=-=-=
Index: build/jam/OptionalPackages
===================================================================
--- build/jam/OptionalPackages  (revision 35943)
+++ build/jam/OptionalPackages  (working copy)
@@ -422,13 +422,15 @@
                AddSymlinkToHaikuImage develop abi x86 gcc4 headers
                        : ../tools/current/include/g++ : cpp ;

-               # symlink to the appropriate system/lib[/gcc4] folder
-               local libs = libstdc++.so libsupc++.so ;
-               for lib in $(libs) {
-                       AddSymlinkToHaikuHybridImage
-                               develop abi x86 gcc4 tools 
gcc-4.3.3-haiku-090629 lib
-                               : /system/lib $(lib) : : true ;
-               }
+               if $(HAIKU_GCC_VERSION[1]) = 4 {
+                       # symlink to the appropriate system/lib[/gcc4] folder
+                       local libs = libstdc++.so libsupc++.so ;
+                       for lib in $(libs) {
+                               AddSymlinkToHaikuHybridImage
+                                       develop abi x86 gcc4 tools 
gcc-4.3.3-haiku-090629 lib
+                                       : /system/lib $(lib) : : true ;
+                       }
+               }       
        }

        # other commonly used tools

Other related posts: