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

older
Re: [commit: packages/integer-gmp]...

Karel Gardas

5 Jan 2014 5 Jan '14

5:14 p.m.

--- 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

Show replies by date

Herbert Valerio Riedel

5 Jan 5 Jan

5:29 p.m.

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

Karel Gardas

5:40 p.m.

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

Karel Gardas

13 Jan 13 Jan

5:13 p.m.

Hello Herbert, the fix in a little bit extended version is already up-stream: https://github.com/haskell/cabal/commit/98a3feb23364897779dd665758949555a84d... 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

Herbert Valerio Riedel

10:38 p.m.

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/98a3feb23364897779dd665758949555a84d...

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

Mikhail Glushenkov

14 Jan 14 Jan

12:35 p.m.

Hi, On Mon, Jan 13, 2014 at 11:38 PM, Herbert Valerio Riedel 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

Johan Tibell

16 Jan 16 Jan

3:19 p.m.

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@gmail.com> wrote:

...

Hi,

On Mon, Jan 13, 2014 at 11:38 PM, Herbert Valerio Riedel 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@haskell.org http://www.haskell.org/mailman/listinfo/ghc-devs

4198

Age (days ago)

4209

Last active (days ago)

List overview

Download

6 comments

4 participants

participants (4)

Herbert Valerio Riedel
Johan Tibell
Karel Gardas
Mikhail Glushenkov