/dev-lang/ghc/files/ghc-8.2.1_rc1-win32-cross-1.patch

https://gitlab.com/argent/portage · Patch · 124 lines · 103 code · 21 blank · 0 comment · 0 complexity · a2d6c344857edfbf472057f9cc80f342 MD5 · raw file 

    

  1. commit a691f6a7a191a268380805481d8e63134764a4a1
    2. 

  2. Author: Sergei Trofimovich <slyfox@inbox.ru>
    3. 

  3. Date:   Sat Apr 29 22:02:24 2017 +0100
    4. 

  4. 

  5.     add basic cross-compilation support (#87)
    6. 

  6.     
    7. 

  7.     * fix include case: s/#include <Lmcons.h>/#include <lmcons.h>
    8. 

  8.     
    9. 

  9.     Noticed when cross-compiling win32 on linux to i686-w64-mingw32-gcc.
    10. 

  10.     i686-w64-mingw32 provides all headers in lowercase.
    11. 

  11.     
    12. 

  12.     Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    13. 

  13.     
    14. 

  14.     * Pen.hsc: don't use c99-style comments in enum declarations
    15. 

  15.     
    16. 

  16.     Ths change workarounds hsc2hs bug in cross-compile mode:
    17. 

  17.     https://ghc.haskell.org/trac/ghc/ticket/13619
    18. 

  18.     
    19. 

  19.     To reproduce the build failure it's enough to run
    20. 

  20.       $ cabal configure --hsc2hs-options='--cross-safe --cross-compile'
    21. 

  21.       $ cabal build     --hsc2hs-options='--cross-safe --cross-compile'
    22. 

  22.     
    23. 

  23.     Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    24. 

  24.     
    25. 

  25.     * SimpleMAPI.hsc: don't use #ifdef in enum declarations
    26. 

  26.     
    27. 

  27.     This change workarounds hsc2hs bug in cross-compile mode:
    28. 

  28.     https://ghc.haskell.org/trac/ghc/ticket/13620
    29. 

  29.     
    30. 

  30.     To reproduce the build failure it's enough to run
    31. 

  31.       $ cabal configure --hsc2hs-options='--cross-safe --cross-compile'
    32. 

  32.       $ cabal build     --hsc2hs-options='--cross-safe --cross-compile'
    33. 

  33.     
    34. 

  34.     Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    35. 

  35. 

  36. diff --git a/Graphics/Win32/GDI/Pen.hsc b/Graphics/Win32/GDI/Pen.hsc
    37. 

  37. index c880170..8d8df5d 100644
    38. 

  38. --- a/Graphics/Win32/GDI/Pen.hsc
    39. 

  39. +++ b/Graphics/Win32/GDI/Pen.hsc
    40. 

  40. @@ -56,7 +56,7 @@ foreign import WINDOWS_CCONV unsafe "windows.h DeleteObject"
    41. 

  41.  
    42. 

  42.  type PenStyle   = INT
    43. 

  43.  
    44. 

  44. -#{enum PenStyle,                              // Pick one of these
    45. 

  45. +#{enum PenStyle,
    46. 

  46.   , pS_SOLID             = PS_SOLID            // default
    47. 

  47.   , pS_DASH              = PS_DASH             // -------
    48. 

  48.   , pS_DOT               = PS_DOT              // .......
    49. 

  49. @@ -69,14 +69,14 @@ type PenStyle   = INT
    50. 

  50.   , pS_STYLE_MASK        = PS_STYLE_MASK       // all the above
    51. 

  51.   }
    52. 

  52.  
    53. 

  53. -#{enum PenStyle ,                             // "or" with one of these
    54. 

  54. +#{enum PenStyle,
    55. 

  55.   , pS_ENDCAP_ROUND      = PS_ENDCAP_ROUND     // default
    56. 

  56.   , pS_ENDCAP_SQUARE     = PS_ENDCAP_SQUARE
    57. 

  57.   , pS_ENDCAP_FLAT       = PS_ENDCAP_FLAT
    58. 

  58.   , pS_ENDCAP_MASK       = PS_ENDCAP_MASK      // all the above
    59. 

  59.   }
    60. 

  60.  
    61. 

  61. -#{enum PenStyle,                              // "or" with one of these
    62. 

  62. +#{enum PenStyle,
    63. 

  63.   , pS_JOIN_ROUND        = PS_JOIN_ROUND       // default
    64. 

  64.   , pS_JOIN_BEVEL        = PS_JOIN_BEVEL
    65. 

  65.   , pS_JOIN_MITER        = PS_JOIN_MITER
    66. 

  66. @@ -87,7 +87,7 @@ If PS_JOIN_MASK is not defined with your GNU Windows32 header files,
    67. 

  67.  you'll have to define it.
    68. 

  68.  -}
    69. 

  69.  
    70. 

  70. -#{enum PenStyle,                              // "or" with one of these
    71. 

  71. +#{enum PenStyle,
    72. 

  72.   , pS_COSMETIC          = PS_COSMETIC         // default
    73. 

  73.   , pS_GEOMETRIC         = PS_GEOMETRIC
    74. 

  74.   , pS_TYPE_MASK         = PS_TYPE_MASK        // all the above
    75. 

  75. diff --git a/System/Win32/Info/Computer.hsc b/System/Win32/Info/Computer.hsc
    76. 

  76. index bb2eb72..65ae8dc 100644
    77. 

  77. --- a/System/Win32/Info/Computer.hsc
    78. 

  78. +++ b/System/Win32/Info/Computer.hsc
    79. 

  79. @@ -65,7 +65,7 @@ import System.Win32.Utils    ( tryWithoutNull )
    80. 

  80.  import System.Win32.Word     ( DWORD, LPDWORD )

    81. 

  81.  

    82. 

  82.  #include <windows.h>

    83. 

  83. -#include <Lmcons.h>

    84. 

  84. +#include <lmcons.h>

    85. 

  85.  #include "alignment.h"

    86. 

  86.  ##include "windows_cconv.h"

    87. 

  87.  

    88. 

  88. diff --git a/System/Win32/SimpleMAPI.hsc b/System/Win32/SimpleMAPI.hsc
    89. 

  89. index 9727cfc..5ebf06b 100644
    90. 

  90. --- a/System/Win32/SimpleMAPI.hsc
    91. 

  91. +++ b/System/Win32/SimpleMAPI.hsc
    92. 

  92. @@ -53,12 +53,6 @@ type MapiFlag = ULONG
    93. 

  93.      , mAPI_LOGON_UI         = MAPI_LOGON_UI
    94. 

  94.      , mAPI_NEW_SESSION      = MAPI_NEW_SESSION
    95. 

  95.      , mAPI_FORCE_DOWNLOAD   = MAPI_FORCE_DOWNLOAD
    96. 

  96. -#ifdef MAPI_LOGOFF_SHARED
    97. 

  97. -    , mAPI_LOGOFF_SHARED    = MAPI_LOGOFF_SHARED
    98. 

  98. -#endif
    99. 

  99. -#ifdef MAPI_LOGOFF_UI
    100. 

  100. -    , mAPI_LOGOFF_UI        = MAPI_LOGOFF_UI
    101. 

  101. -#endif
    102. 

  102.      , mAPI_DIALOG           = MAPI_DIALOG
    103. 

  103.      , mAPI_UNREAD_ONLY      = MAPI_UNREAD_ONLY
    104. 

  104.      , mAPI_LONG_MSGID       = MAPI_LONG_MSGID
    105. 

  105. @@ -74,6 +68,19 @@ type MapiFlag = ULONG
    106. 

  106.      , mAPI_RECEIPT_REQUESTED = MAPI_RECEIPT_REQUESTED
    107. 

  107.      , mAPI_SENT             = MAPI_SENT
    108. 

  108.      }
    109. 

  109. +-- Have to define enum values outside previous declaration due to
    110. 

  110. +-- hsc2hs bug in --cross-compile mode:
    111. 

  111. +--    https://ghc.haskell.org/trac/ghc/ticket/13620
    112. 

  112. +#ifdef MAPI_LOGOFF_SHARED
    113. 

  113. +#{enum MapiFlag,
    114. 

  114. +    , mAPI_LOGOFF_SHARED    = MAPI_LOGOFF_SHARED
    115. 

  115. +}
    116. 

  116. +#endif
    117. 

  117. +#ifdef MAPI_LOGOFF_UI
    118. 

  118. +#{enum MapiFlag,
    119. 

  119. +    , mAPI_LOGOFF_UI        = MAPI_LOGOFF_UI
    120. 

  120. +}
    121. 

  121. +#endif
    122. 

  122.  
    123. 

  123.  mapiErrors :: [(ULONG,String)]
    124. 

  124.  mapiErrors =
    125.