[cfe-dev] Ubuntu install location fixes

[Chris Lattner]

On Feb 16, 2010, at 6:18 AM, Riccardo Magliocchetti wrote:

> Hello again :)
> 
> Gonsolo ha scritto:
>>> Since next stable debian will be released with 4.4 i think that the
>>> comment should say squeeze. Then could you please diff the four patches
>>> in one for easier review / test?
>> I donẗ know about Debian, I just did what you suggested. Can you provide a patch?
> 
> I just meant to rename "Sid" to "squeeze". Anyway not a big issue, we can remove the debian Sid entry and remove the ubuntu 8.10 entry which is wrong. Ubuntu 8.10 path is the same as 9.04 and debian squeeze / sid for now are the same as 9.10. So attached you can find a patch that consolidates the ubuntu paths.
> 
> Since this can lead to some confusion to non debian / ubuntu users we have to make some premises: first we have a link from /usr/include/c++/x.y to /usr/include/c++/x.y.z, then x.y.z may vary during debian testing and unstable development.
> 
>> I use git for developing which automatically generates my patches. Isn't it easier to review with modular patches?
> 
> You move then delete the same hunk of code in two different patches, that's difficult to follow for me.

Would it be possible to convince you guys to replace this with some code that uses the "last" directory in /usr/include/c++ with readdir?  That way we could stop manually adding new versions.

-Chris


> 
> thanks,
> riccardo
> 
> Index: lib/Frontend/InitHeaderSearch.cpp
> ===================================================================
> --- lib/Frontend/InitHeaderSearch.cpp	(revisione 96342)
> +++ lib/Frontend/InitHeaderSearch.cpp	(copia locale)
> @@ -488,18 +488,19 @@
>                                 "x86_64-pc-linux-gnu", "32", "", triple);
>     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.3",
>                                 "i686-pc-linux-gnu", "", "", triple);
> -    // Debian sid
> -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.2",
> -                                "x86_64-linux-gnu", "32", "", triple);
>     // Ubuntu 7.10 - Gutsy Gibbon
>     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.3",
>                                 "i486-linux-gnu", "", "", triple);
>     // Ubuntu 9.04
> -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3.3",
> +    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
>                                 "x86_64-linux-gnu","32", "", triple);
> +    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
> +                                "i486-linux-gnu","", "", triple);
>     // Ubuntu 9.10
> -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4.1",
> +    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
>                                 "x86_64-linux-gnu", "32", "", triple);
> +    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.4",
> +                                "i486-linux-gnu", "", "", triple);
>     // Fedora 8
>     AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.1.2",
>                                 "i386-redhat-linux", "", "", triple);
> @@ -554,12 +555,6 @@
>     AddGnuCPlusPlusIncludePaths(
>       "/usr/lib/gcc/i686-pc-linux-gnu/4.1.2/include/g++-v4",
>       "i686-pc-linux-gnu", "", "", triple);
> -    // Ubuntu 8.10
> -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
> -                                "i486-pc-linux-gnu", "", "", triple);
> -    // Ubuntu 9.04
> -    AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.3",
> -                                "i486-linux-gnu","", "", triple);
>     // Gentoo amd64 stable
>     AddGnuCPlusPlusIncludePaths(
>         "/usr/lib/gcc/x86_64-pc-linux-gnu/4.1.2/include/g++-v4",
> _______________________________________________
> cfe-dev mailing list
> cfe-dev at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev