diff --git a/CHANGELOG b/CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +0.3.7.7 (2022-05-25): + - Updated the `alignment` macro to avoid warnings on hsc2hs-0.68 (ghc-8.0); also fixing cross-compilation for Arm AArch64: + * 0.3.7.6 (2021-11-02): - Updated version bounds for GHC 8.2.1 0.3.7.5 (2021-10-24): diff --git a/src/Foreign/C/Error/Safe.hs b/src/Foreign/C/Error/Safe.hs --- a/src/Foreign/C/Error/Safe.hs +++ b/src/Foreign/C/Error/Safe.hs @@ -4,8 +4,8 @@ -- 2021.10.17 -- | -- Module : Foreign.C.Error.Safe --- Copyright : Copyright (c) 2010--2021 wren gayle romano --- License : BSD +-- Copyright : 2010--2022 wren romano +-- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : provisional -- Portability : portable (H98+FFI) diff --git a/src/System/Posix/IO/ByteString.hsc b/src/System/Posix/IO/ByteString.hsc --- a/src/System/Posix/IO/ByteString.hsc +++ b/src/System/Posix/IO/ByteString.hsc @@ -27,8 +27,8 @@ -- 2021.10.17 -- | -- Module : System.Posix.IO.ByteString --- Copyright : Copyright (c) 2010--2021 wren gayle romano --- License : BSD +-- Copyright : 2010--2022 wren romano +-- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (POSIX.1, XPG4.2; hsc2hs, FFI) diff --git a/src/System/Posix/IO/ByteString/Lazy.hs b/src/System/Posix/IO/ByteString/Lazy.hs --- a/src/System/Posix/IO/ByteString/Lazy.hs +++ b/src/System/Posix/IO/ByteString/Lazy.hs @@ -4,8 +4,8 @@ -- 2021.10.17 -- | -- Module : System.Posix.IO.ByteString.Lazy --- Copyright : Copyright (c) 2010--2021 wren gayle romano --- License : BSD +-- Copyright : 2010--2022 wren romano +-- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (requires POSIX.1, XPG4.2) diff --git a/src/System/Posix/Types/Iovec.hsc b/src/System/Posix/Types/Iovec.hsc --- a/src/System/Posix/Types/Iovec.hsc +++ b/src/System/Posix/Types/Iovec.hsc @@ -1,11 +1,11 @@ {-# LANGUAGE ForeignFunctionInterface #-} {-# OPTIONS_GHC -Wall -fwarn-tabs #-} ---------------------------------------------------------------- --- 2021.10.17 +-- 2022.05.25 -- | -- Module : System.Posix.Types.Iovec --- Copyright : Copyright (c) 2010--2021 wren gayle romano --- License : BSD +-- Copyright : 2010--2022 wren romano +-- License : BSD-3-Clause -- Maintainer : wren@cpan.org -- Stability : experimental -- Portability : non-portable (POSIX.1, XPG4.2; hsc2hs, FFI) @@ -52,8 +52,13 @@ , iov_len :: {-# UNPACK #-} !CSize -- size_t } +-- This traditional macro has been incorporated into hcs2hs-0.68 +-- (GHC 8.0), so we cpp guard it for older compilers. +-- +#if __GLASGOW_HASKELL__ < 800 #let alignment t = \ "%lu", (unsigned long) offsetof(struct {char x__; t (y__); }, y__) +#endif instance Storable CIovec where alignment _ = #{alignment struct iovec} diff --git a/unix-bytestring.cabal b/unix-bytestring.cabal --- a/unix-bytestring.cabal +++ b/unix-bytestring.cabal @@ -1,20 +1,25 @@ +Cabal-Version: 2.2 +-- Cabal >=2.2 is required for: +-- +-- Since 2.1, the Cabal-Version must be the absolutely first thing +-- in the file, even before comments. Also, no longer uses ">=". +-- + ---------------------------------------------------------------- --- wren gayle romano ~ 2021.11.02 +-- wren gayle romano ~ 2022.05.25 ---------------------------------------------------------------- --- Cabal >=1.10 is required by Hackage. -Cabal-Version: >= 1.10 -Build-Type: Simple - Name: unix-bytestring -Version: 0.3.7.6 +Version: 0.3.7.7 +Build-Type: Simple Stability: provisional Homepage: https://wrengr.org/software/hackage.html Bug-Reports: https://github.com/wrengr/unix-bytestring/issues Author: wren gayle romano Maintainer: wren@cpan.org -Copyright: Copyright (c) 2010–2021 wren gayle romano -License: BSD3 +Copyright: 2010–2022 wren romano +-- Cabal-2.2 requires us to say "BSD-3-Clause" not "BSD3" +License: BSD-3-Clause License-File: LICENSE Category: System