diff options
| author | cjs <cjs@pkgsrc.org> | 2008-03-31 06:18:12 +0000 |
|---|---|---|
| committer | cjs <cjs@pkgsrc.org> | 2008-03-31 06:18:12 +0000 |
| commit | aed319ba20914faf78fa8a0bdad96760fb20fcaf (patch) | |
| tree | 6da132cd4a31738970e0b9e5568ea629b046cf2c /lang/ghc | |
| parent | 879d5fdf534c729222b02eb0cf2297c4199a4475 (diff) | |
| download | pkgsrc-aed319ba20914faf78fa8a0bdad96760fb20fcaf.tar.gz | |
Fix another system library symbol versioning problem, this time with
socket(), and bump PKGREVISION.
Diffstat (limited to 'lang/ghc')
| -rw-r--r-- | lang/ghc/Makefile | 4 | ||||
| -rw-r--r-- | lang/ghc/distinfo | 4 | ||||
| -rw-r--r-- | lang/ghc/patches/patch-ap | 13 | ||||
| -rw-r--r-- | lang/ghc/patches/patch-aq | 13 |
4 files changed, 31 insertions, 3 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 3a387b636c8..4b1e16c1ed9 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2008/03/24 22:40:23 kristerw Exp $ +# $NetBSD: Makefile,v 1.41 2008/03/31 06:18:12 cjs Exp $ DISTNAME= ghc-6.8.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.haskell.org/ghc/dist/6.8.2/ DISTFILES= ghc-6.8.2-src.tar.bz2 \ diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 6a3440f230b..5a58a2dbf24 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2008/03/24 22:40:23 kristerw Exp $ +$NetBSD: distinfo,v 1.21 2008/03/31 06:18:12 cjs Exp $ SHA1 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 29c1a17a83ec0ddec8ff231e009c740ebc61dd6c RMD160 (ghc-6.4.2-i386-unknown-netbsd-hc.tar.gz) = 5ce775a19797fe257357fedd33db2354dd50d2de @@ -26,3 +26,5 @@ SHA1 (patch-al) = 66264014e24c06237911b786bbadb116bd65b5c1 SHA1 (patch-am) = 031e830eae53234b3c6b4940d6a4532142ddabd0 SHA1 (patch-an) = 3267a1ff00ae74b337e4dbd8f4e1c85cdb1aeed7 SHA1 (patch-ao) = ba3c218d3a6fc70986d159bbae9e41e37f4e0d79 +SHA1 (patch-ap) = 13afc2f1c51fc10f5bc657528599e2d53b11507b +SHA1 (patch-aq) = 554514e160ae2bdcab0dfd444839d333a72b5b4f diff --git a/lang/ghc/patches/patch-ap b/lang/ghc/patches/patch-ap new file mode 100644 index 00000000000..a2436b6fe18 --- /dev/null +++ b/lang/ghc/patches/patch-ap @@ -0,0 +1,13 @@ +$NetBSD: patch-ap,v 1.3 2008/03/31 06:18:12 cjs Exp $ + +--- libraries/network/include/HsNet.h.orig 2007-12-11 03:25:19.000000000 +0900 ++++ libraries/network/include/HsNet.h 2008-03-31 12:36:50.000000000 +0900 +@@ -139,3 +139,8 @@ + } + + #endif ++ ++INLINE int __hsnet_socket(int domain, int type, int protocol) ++{ ++ return socket(domain, type, protocol); ++} diff --git a/lang/ghc/patches/patch-aq b/lang/ghc/patches/patch-aq new file mode 100644 index 00000000000..d3d76694320 --- /dev/null +++ b/lang/ghc/patches/patch-aq @@ -0,0 +1,13 @@ +$NetBSD: patch-aq,v 1.3 2008/03/31 06:18:12 cjs Exp $ + +--- libraries/network/Network/Socket.hsc.orig 2008-03-31 12:40:13.000000000 +0900 ++++ libraries/network/Network/Socket.hsc 2008-03-31 12:40:41.000000000 +0900 +@@ -2499,7 +2499,7 @@ + c_close :: CInt -> IO CInt + #endif + +-foreign import CALLCONV unsafe "socket" ++foreign import CALLCONV unsafe "__hsnet_socket" + c_socket :: CInt -> CInt -> CInt -> IO CInt + foreign import CALLCONV unsafe "bind" + c_bind :: CInt -> Ptr SockAddr -> CInt{-CSockLen???-} -> IO CInt |