From c2c06d35b84ec3ad97afedc0d4dff791e1c373fe1c43f76e211592b92a3222a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:39 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-network revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-network?expand=0&rev=73 --- ghc-network.changes | 11 +++ ghc-network.spec | 8 ++ network.cabal | 173 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 network.cabal diff --git a/ghc-network.changes b/ghc-network.changes index 5f3f3f7..0e54106 100644 --- a/ghc-network.changes +++ b/ghc-network.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + +------------------------------------------------------------------- +Fri Dec 4 10:51:26 UTC 2020 - psimons@suse.com + +- Update network to version 3.1.2.1 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Fri Nov 27 09:27:38 UTC 2020 - psimons@suse.com diff --git a/ghc-network.spec b/ghc-network.spec index cf0e353..8086735 100644 --- a/ghc-network.spec +++ b/ghc-network.spec @@ -25,11 +25,18 @@ Summary: Low-level networking interface License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -70,6 +77,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/network.cabal b/network.cabal new file mode 100644 index 0000000..cd42d66 --- /dev/null +++ b/network.cabal @@ -0,0 +1,173 @@ +cabal-version: 1.18 +name: network +version: 3.1.2.1 +x-revision: 1 +license: BSD3 +license-file: LICENSE +maintainer: Kazu Yamamoto, Evan Borden +synopsis: Low-level networking interface +description: + This package provides a low-level networking interface. + . + === High-Level Packages + Other packages provide higher level interfaces: + . + * connection + * hookup + * network-simple + . + === Extended Packages + @network@ seeks to provide a cross-platform core for networking. As such some + APIs live in extended libraries. Packages in the @network@ ecosystem are + often prefixed with @network-@. + . + ==== @network-bsd@ + In @network-3.0.0.0@ the @Network.BSD@ module was split off into its own + package, @network-bsd-3.0.0.0@. + . + ==== @network-uri@ + In @network-2.6@ the @Network.URI@ module was split off into its own package, + @network-uri-2.6@. If you're using the @Network.URI@ module you can + automatically get it from the right package by adding this to your @.cabal@ + file: + . + > library + > build-depends: network-uri-flag +category: Network +build-type: Configure +extra-tmp-files: + config.log config.status autom4te.cache network.buildinfo + include/HsNetworkConfig.h +extra-source-files: + README.md CHANGELOG.md + examples/*.hs tests/*.hs config.guess config.sub install-sh + configure.ac configure + include/HsNetworkConfig.h.in include/HsNet.h include/HsNetDef.h + -- C sources only used on some systems + cbits/asyncAccept.c cbits/initWinSock.c + cbits/winSockErr.c cbits/cmsg.c +homepage: https://github.com/haskell/network +bug-reports: https://github.com/haskell/network/issues +tested-with: GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.3 + , GHC == 8.10.1 + +flag devel + description: using tests for developers + default: False + +library + default-language: Haskell2010 + exposed-modules: + Network.Socket + Network.Socket.Address + Network.Socket.ByteString + Network.Socket.ByteString.Lazy + Network.Socket.Internal + other-modules: + Network.Socket.Buffer + Network.Socket.ByteString.IO + Network.Socket.ByteString.Internal + Network.Socket.Cbits + Network.Socket.Fcntl + Network.Socket.Flag + Network.Socket.Handle + Network.Socket.If + Network.Socket.Imports + Network.Socket.Info + Network.Socket.Name + Network.Socket.Options + Network.Socket.ReadShow + Network.Socket.Shutdown + Network.Socket.SockAddr + Network.Socket.Syscall + Network.Socket.Types + Network.Socket.Unix + + build-depends: + base >= 4.9 && < 5, + bytestring >= 0.10 && < 0.12, + deepseq, + directory + + include-dirs: include + includes: HsNet.h HsNetDef.h alignment.h win32defs.h + install-includes: HsNet.h HsNetDef.h alignment.h win32defs.h + c-sources: cbits/HsNet.c cbits/cmsg.c + ghc-options: -Wall -fwarn-tabs + build-tools: hsc2hs + + + -- Add some platform specific stuff + if !os(windows) + other-modules: + Network.Socket.ByteString.Lazy.Posix + Network.Socket.Posix.Cmsg + Network.Socket.Posix.CmsgHdr + Network.Socket.Posix.IOVec + Network.Socket.Posix.MsgHdr + + if os(solaris) + extra-libraries: nsl, socket + + if os(windows) + other-modules: + Network.Socket.ByteString.Lazy.Windows + Network.Socket.Win32.Cmsg + Network.Socket.Win32.CmsgHdr + Network.Socket.Win32.WSABuf + Network.Socket.Win32.MsgHdr + c-sources: cbits/initWinSock.c, cbits/winSockErr.c, cbits/asyncAccept.c + extra-libraries: ws2_32, iphlpapi, mswsock + -- See https://github.com/haskell/network/pull/362 + if impl(ghc >= 7.10) + cpp-options: -D_WIN32_WINNT=0x0600 + cc-options: -D_WIN32_WINNT=0x0600 + +test-suite spec + default-language: Haskell2010 + hs-source-dirs: tests + main-is: Spec.hs + if flag(devel) + cpp-options: -DDEVELOPMENT + other-modules: + Network.Test.Common + Network.SocketSpec + Network.Socket.ByteStringSpec + Network.Socket.ByteString.LazySpec + type: exitcode-stdio-1.0 + ghc-options: -Wall -threaded + -- NB: make sure to versions of hspec and hspec-discover + -- that work together; easiest way is to constraint + -- both packages to a small enough version range. + build-tools: hspec-discover >= 2.6 + build-depends: + base >= 4.9 && < 5, + bytestring, + directory, + HUnit, + network, + temporary, + hspec >= 2.6, + QuickCheck + +test-suite doctests + buildable: False + default-language: Haskell2010 + hs-source-dirs: tests + main-is: doctests.hs + type: exitcode-stdio-1.0 + + build-depends: + base >= 4.9 && < 5, + doctest >= 0.10.1, + network + + ghc-options: -Wall + +source-repository head + type: git + location: git://github.com/haskell/network.git