[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Karel Gardas
---
 Cabal/Distribution/System.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
index a18e491..4fc76f6 100644
--- a/Cabal/Distribution/System.hs
+++ b/Cabal/Distribution/System.hs
@@ -89,7 +89,7 @@ osAliases Compat     Windows = ["mingw32", "win32"]
 osAliases _          OSX     = ["darwin"]
 osAliases _          IOS     = ["ios"]
 osAliases Permissive FreeBSD = ["kfreebsdgnu"]
-osAliases Permissive Solaris = ["solaris2"]
+osAliases _          Solaris = ["solaris2"]
 osAliases _          _       = []
 
 instance Text OS where
--
1.7.3.2


Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Herbert Valerio Riedel-3
Hello Karel,

Please submit this fix at the upstream Cabal project
at https://github.com/haskell/cabal/issues

When it's merged upstream we can sync up GHC's in-tree copy of the Cabal
library to Cabal upstream.

Thanks,
   hvr

On 2014-01-05 at 18:14:08 +0100, Karel Gardas wrote:

> ---
>  Cabal/Distribution/System.hs |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
> index a18e491..4fc76f6 100644
> --- a/Cabal/Distribution/System.hs
> +++ b/Cabal/Distribution/System.hs
> @@ -89,7 +89,7 @@ osAliases Compat     Windows = ["mingw32", "win32"]
>  osAliases _          OSX     = ["darwin"]
>  osAliases _          IOS     = ["ios"]
>  osAliases Permissive FreeBSD = ["kfreebsdgnu"]
> -osAliases Permissive Solaris = ["solaris2"]
> +osAliases _          Solaris = ["solaris2"]
>  osAliases _          _       = []
>  
>  instance Text OS where

--
"Elegance is not optional" -- Richard O'Keefe

Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Karel Gardas

Herbert,

thanks for the note, the issue is here:
https://github.com/haskell/cabal/issues/1641

Karel

On 01/ 5/14 06:29 PM, Herbert Valerio Riedel wrote:

> Hello Karel,
>
> Please submit this fix at the upstream Cabal project
> at https://github.com/haskell/cabal/issues
>
> When it's merged upstream we can sync up GHC's in-tree copy of the Cabal
> library to Cabal upstream.
>
> Thanks,
>     hvr
>
> On 2014-01-05 at 18:14:08 +0100, Karel Gardas wrote:
>> ---
>>   Cabal/Distribution/System.hs |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
>> index a18e491..4fc76f6 100644
>> --- a/Cabal/Distribution/System.hs
>> +++ b/Cabal/Distribution/System.hs
>> @@ -89,7 +89,7 @@ osAliases Compat     Windows = ["mingw32", "win32"]
>>   osAliases _          OSX     = ["darwin"]
>>   osAliases _          IOS     = ["ios"]
>>   osAliases Permissive FreeBSD = ["kfreebsdgnu"]
>> -osAliases Permissive Solaris = ["solaris2"]
>> +osAliases _          Solaris = ["solaris2"]
>>   osAliases _          _       = []
>>
>>   instance Text OS where
>


Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Karel Gardas
In reply to this post by Herbert Valerio Riedel-3

Hello Herbert,

the fix in a little bit extended version is already up-stream:
https://github.com/haskell/cabal/commit/98a3feb23364897779dd665758949555a84dc5b8

What is the process to ask ghc developers to update from upstream?

Thanks!
Karel

On 01/ 5/14 06:29 PM, Herbert Valerio Riedel wrote:

> Hello Karel,
>
> Please submit this fix at the upstream Cabal project
> at https://github.com/haskell/cabal/issues
>
> When it's merged upstream we can sync up GHC's in-tree copy of the Cabal
> library to Cabal upstream.
>
> Thanks,
>     hvr
>
> On 2014-01-05 at 18:14:08 +0100, Karel Gardas wrote:
>> ---
>>   Cabal/Distribution/System.hs |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/Cabal/Distribution/System.hs b/Cabal/Distribution/System.hs
>> index a18e491..4fc76f6 100644
>> --- a/Cabal/Distribution/System.hs
>> +++ b/Cabal/Distribution/System.hs
>> @@ -89,7 +89,7 @@ osAliases Compat     Windows = ["mingw32", "win32"]
>>   osAliases _          OSX     = ["darwin"]
>>   osAliases _          IOS     = ["ios"]
>>   osAliases Permissive FreeBSD = ["kfreebsdgnu"]
>> -osAliases Permissive Solaris = ["solaris2"]
>> +osAliases _          Solaris = ["solaris2"]
>>   osAliases _          _       = []
>>
>>   instance Text OS where
>


Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Herbert Valerio Riedel-3
Hello Karel,

On 2014-01-13 at 18:13:55 +0100, Karel Gardas wrote:
> Hello Herbert,
>
> the fix in a little bit extended version is already up-stream:
> https://github.com/haskell/cabal/commit/98a3feb23364897779dd665758949555a84dc5b8

well, it's a first step that's in the master branch, but GHC HEAD
currently tracks the stable Cabal branch (currently this is "1.18"[1])
as we want GHC to ship with a proper release of the Cabal lib.

> What is the process to ask ghc developers to update from upstream?

You'll need to persuade the Cabal devs to make the fix above available
in a stable branch; if the fix makes it into a Cabal release in time for
the final GHC 7.8 release, it will most likely be part of 7.8. However,
I don't know if there's a concrete plan for a Cabal-1.18.1.3 release
currently.

 [1]: https://github.com/haskell/cabal/commits/1.18

Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Mikhail Glushenkov-2
Hi,

On Mon, Jan 13, 2014 at 11:38 PM, Herbert Valerio Riedel
<hvriedel at gmail.com> wrote:
>
> You'll need to persuade the Cabal devs to make the fix above available
> in a stable branch; if the fix makes it into a Cabal release in time for
> the final GHC 7.8 release, it will most likely be part of 7.8. However,
> I don't know if there's a concrete plan for a Cabal-1.18.1.3 release
> currently.

Johan is the final authority on this, but IIRC we wanted 1.18.1.2 to
be the final 1.18 release. I'll merge that fix into the 1.18 branch.

--
()  ascii ribbon campaign - against html e-mail
/\  www.asciiribbon.org   - against proprietary attachments

Reply | Threaded
Open this post in threaded view
|

[PATCH] platformFromTriple: fix to recognize Solaris triple (i386-pc-solaris2.11)

Johan Tibell-2
I've merged the fix into the 1.18. I'm OK making one very last release in
the 1.18 once we're done with the GHC 7.8 RC. Herbert promised to let me
know when we are.


On Tue, Jan 14, 2014 at 4:35 AM, Mikhail Glushenkov <
the.dead.shall.rise at gmail.com> wrote:

> Hi,
>
> On Mon, Jan 13, 2014 at 11:38 PM, Herbert Valerio Riedel
> <hvriedel at gmail.com> wrote:
> >
> > You'll need to persuade the Cabal devs to make the fix above available
> > in a stable branch; if the fix makes it into a Cabal release in time for
> > the final GHC 7.8 release, it will most likely be part of 7.8. However,
> > I don't know if there's a concrete plan for a Cabal-1.18.1.3 release
> > currently.
>
> Johan is the final authority on this, but IIRC we wanted 1.18.1.2 to
> be the final 1.18 release. I'll merge that fix into the 1.18 branch.
>
> --
> ()  ascii ribbon campaign - against html e-mail
> /\  www.asciiribbon.org   - against proprietary attachments
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://www.haskell.org/mailman/listinfo/ghc-devs
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20140116/31fa6d00/attachment.html>