diff options
| author | Joachim Breitner <mail@joachim-breitner.de> | 2012-06-15 11:31:04 +0400 |
|---|---|---|
| committer | Joachim Breitner <mail@joachim-breitner.de> | 2012-06-15 11:31:04 +0400 |
| commit | 9e2762b76dc6e7416ba22c7eeab9943841604de0 (patch) | |
| tree | 0c1e39854362a02cd9a520aebc0c97668ed23d02 /p/haskell-cpu | |
| parent | ab2aaa7de40e79589fa03ff9320b51c1cfb3a716 (diff) | |
| download | DHG_packages-9e2762b76dc6e7416ba22c7eeab9943841604de0.tar.gz | |
haskell-cpu: releasing version 0.1.1-1
Diffstat (limited to 'p/haskell-cpu')
| -rw-r--r-- | p/haskell-cpu/debian/changelog | 6 | ||||
| -rw-r--r-- | p/haskell-cpu/debian/patches/make-getSystemEndianness-inlineable | 42 | ||||
| -rw-r--r-- | p/haskell-cpu/debian/patches/series | 1 |
3 files changed, 3 insertions, 46 deletions
diff --git a/p/haskell-cpu/debian/changelog b/p/haskell-cpu/debian/changelog index 704ad38ce..f7338f008 100644 --- a/p/haskell-cpu/debian/changelog +++ b/p/haskell-cpu/debian/changelog @@ -1,8 +1,8 @@ -haskell-cpu (0.1.1-1) UNRELEASED; urgency=low +haskell-cpu (0.1.1-1) unstable; urgency=low - * New upstream release + * Upstream just made a new release with the patch, using that one. - -- Joachim Breitner <nomeata@debian.org> Fri, 15 Jun 2012 09:29:24 +0200 + -- Joachim Breitner <nomeata@debian.org> Fri, 15 Jun 2012 09:30:23 +0200 haskell-cpu (0.1.0-3) unstable; urgency=low diff --git a/p/haskell-cpu/debian/patches/make-getSystemEndianness-inlineable b/p/haskell-cpu/debian/patches/make-getSystemEndianness-inlineable deleted file mode 100644 index fcee46764..000000000 --- a/p/haskell-cpu/debian/patches/make-getSystemEndianness-inlineable +++ /dev/null @@ -1,42 +0,0 @@ -Description: Make getSystemEndianness zero cost -Author: Joachim Breitner <nomeata@debian.org> -Bug: https://github.com/vincenthz/hs-cpu/issues/1 -Forwarded: https://github.com/vincenthz/hs-cpu/pull/2 - ---- haskell-cpu-0.1.0.orig/System/Endian.hs -+++ haskell-cpu-0.1.0/System/Endian.hs -@@ -21,11 +21,10 @@ module System.Endian - , toBE64 - ) where - --import Foreign.Marshal.Alloc --import Foreign.Storable --import Foreign.Ptr -+#include "MachDeps.h" -+ -+import Unsafe.Coerce (unsafeCoerce) - import Foreign.C.Types --import System.IO.Unsafe (unsafePerformIO) - import Data.Word - - -- | represent the CPU endianness -@@ -40,14 +39,11 @@ data Endianness = LittleEndian - - -- | return the system endianness - getSystemEndianness :: Endianness --getSystemEndianness = unsafePerformIO $ alloca $ \p -> -- poke p cst >> peek (castPtr p) >>= return . check -- where cst :: Word32 -- cst = 0x01000000 -- check :: Word8 -> Endianness -- check x -- | x == 0x01 = BigEndian -- | otherwise = LittleEndian -+#ifdef WORDS_BIGENDIAN -+getSystemEndianness = BigEndian -+#else -+getSystemEndianness = LittleEndian -+#endif - - -- | Convert from a big endian 64 bit value to the cpu endianness - fromBE64 :: Word64 -> Word64 diff --git a/p/haskell-cpu/debian/patches/series b/p/haskell-cpu/debian/patches/series deleted file mode 100644 index 2bbf29bb5..000000000 --- a/p/haskell-cpu/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -make-getSystemEndianness-inlineable |