From c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 May 2021 01:33:16 +0100 Subject: gentoo resync : 07.05.2021 --- dev-haskell/Manifest.gz | Bin 129492 -> 129493 bytes dev-haskell/c2hs/Manifest | 2 + dev-haskell/c2hs/c2hs-0.28.7.ebuild | 43 +++++++++++++++++++++ dev-haskell/language-c/Manifest | 2 + .../language-c/files/language-c-0.8.3-gcc-11.patch | 41 ++++++++++++++++++++ dev-haskell/language-c/language-c-0.8.3-r1.ebuild | 41 ++++++++++++++++++++ 6 files changed, 129 insertions(+) create mode 100644 dev-haskell/c2hs/c2hs-0.28.7.ebuild create mode 100644 dev-haskell/language-c/files/language-c-0.8.3-gcc-11.patch create mode 100644 dev-haskell/language-c/language-c-0.8.3-r1.ebuild (limited to 'dev-haskell') diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz index b87768eaa7a2..7e07ab88ba1b 100644 Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest index 2e1cf91596d5..83d63713a1dd 100644 --- a/dev-haskell/c2hs/Manifest +++ b/dev-haskell/c2hs/Manifest @@ -1,3 +1,5 @@ DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9 +DIST c2hs-0.28.7.tar.gz 207782 BLAKE2B a9f29506e6aaec3400d844ad85b2a6b6e1b87cb3c6c641665ab6bc5465903da8c2c82c3511b451e54cf30dfac61092dd323f8a2af48b5daa6081a4e9c5f00c9d SHA512 69c877349ae4864763d20664edae07a67aa1c55f5d4fccc3fcb6d06e94eb14d6b4b0201fc2840a9ebbc45a2a21ab55ad0e79f9cd88c00003df67abf5c1fd62d6 EBUILD c2hs-0.28.6.ebuild 977 BLAKE2B f912543b5b0411143f1f1534f1c2e1ee0fdb64d50ee4ed468849eba2fa635c58df0fe1872e5d7c4ee384acaaab4b47f90dddb57d6527a3e24308f72704f51048 SHA512 93b43e383b763d9acae9fbf5f3762f0012b3007dcf4e81c705a10bb7a84b336d2dc1e5275994dda95565c71d5e0e21e0bd8ac6bdc0d01b0111f62921eca4ac12 +EBUILD c2hs-0.28.7.ebuild 1113 BLAKE2B 89b6071b686da6f0116d04be90ffcf797ee06fe8f687a8d15c441fe4095dc96ed90883d0f01880be5bedb2baea4ab0a99fe10a7f9fb886436018f89cffb166b4 SHA512 c3ba90614f7e15a8911e250ed61ceebc4c456c6d7bdac83c661858e9e3457173a876d1ebbd67a24fc9931a51e020b9645b13c8d8e795830328297160db40e098 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05 diff --git a/dev-haskell/c2hs/c2hs-0.28.7.ebuild b/dev-haskell/c2hs/c2hs-0.28.7.ebuild new file mode 100644 index 000000000000..99e58a64012a --- /dev/null +++ b/dev-haskell/c2hs/c2hs-0.28.7.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 + +CABAL_FEATURES="test-suite" +inherit haskell-cabal + +DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" +HOMEPAGE="https://github.com/haskell/c2hs" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="regression" + +RESTRICT=test # needs unprefixed 'cpp' + +RDEPEND="dev-haskell/dlist:= + dev-haskell/fail:= + >=dev-haskell/language-c-0.7.1:= =dev-lang/ghc-7.4.1:= + regression? ( >=dev-haskell/shelly-1.9.0:= =dev-haskell/yaml-0.8:= ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10 + test? ( dev-haskell/hunit + dev-haskell/test-framework + dev-haskell/test-framework-hunit + dev-haskell/transformers + !regression? ( >=dev-haskell/shelly-1.9.0 +Date: Sat, 8 Aug 2020 23:43:12 +0100 +Subject: [PATCH] Lexer: allow zeros as line numbers in preprocessed directives + +Starting from `gcc-11` initial line numbers not related to +actual files are marked as zeros. See the "preprocessor: +Better line info for & " +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bf2ff0d52a9 + +language-c's grammar did not allow it (by accident) + +``` +Prelude> Language.C.parseC (Data.ByteString.Char8.pack "# 0 \"/dev/null\"\n") Language.C.nopos +Left :: [ERROR] >>> Syntax Error ! + Lexical error ! + The character '#' does not fit here. +``` + +The change allows '0' in line numbers as well. + +Closes: https://github.com/visq/language-c/issues/74 +Signed-off-by: Sergei Trofimovich +--- + src/Language/C/Parser/Lexer.x | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/Language/C/Parser/Lexer.x ++++ b/src/Language/C/Parser/Lexer.x +@@ -147,7 +147,7 @@ $white+ ; + -- + -- * see https://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html + -- +-\#$space*@int$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol ++\#$space*@digits$space*(\"($infname|@charesc)*\"$space*)?(@int$space*)*\r?$eol + { \pos len str -> setPos (adjustLineDirective len (takeChars len str) pos) >> lexToken' False } + + -- #pragma directive (K&R A12.8) +-- +2.28.0 + diff --git a/dev-haskell/language-c/language-c-0.8.3-r1.ebuild b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild new file mode 100644 index 000000000000..795d688b3cde --- /dev/null +++ b/dev-haskell/language-c/language-c-0.8.3-r1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.9999 +#hackport: flags: -allwarnings,+separatesyb,+usebytestrings,+splitbase,+iecfpextension + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Analysis and generation of C code" +HOMEPAGE="http://visq.github.io/language-c/" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="dev-haskell/syb:=[profile?] + >=dev-lang/ghc-7.10.1:= +" +DEPEND="${RDEPEND} + dev-haskell/alex + >=dev-haskell/cabal-1.22.2.0 + dev-haskell/happy +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.3-gcc-11.patch +) + +src_configure() { + haskell-cabal_src_configure \ + --flag=-allwarnings \ + --flag=iecfpextension \ + --flag=separatesyb \ + --flag=splitbase \ + --flag=usebytestrings +} -- cgit v1.2.3