dev-haskell/hadrian: Remove --with-cc configure flag

Bug: gentoo-haskell#1522 Signed-off-by: hololeap <[email protected]>
hololeap · Sep 1, 2024 · a17a29a · a17a29a
1 parent 83ca3eb
commit a17a29a
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 0 deletions.
diff --git a/dev-haskell/hadrian/files/hadrian-9.10.1-remove-with-cc-configure-flag.patch b/dev-haskell/hadrian/files/hadrian-9.10.1-remove-with-cc-configure-flag.patch
@@ -0,0 +1,24 @@
+From: hololeap <[email protected]>
+Date: Sat, 31 Aug 2024 22:26:34 -0600
+Subject: [PATCH 1/1] Remove --with-cc from configure flags
+
+configure responds with:
+
+    WARNING: unrecognized options: --with-cc
+
+This triggers Gentoo's QA notice, "Unrecognized configure options", when
+building GHC.
+
+Signed-off-by: hololeap <[email protected]>
+--- a/src/Settings/Builders/Cabal.hs
++++ b/src/Settings/Builders/Cabal.hs
+@@ -203,7 +203,6 @@ configureArgs cFlags' ldFlags' = do
+         , conf "--with-curses-libraries"  $ arg =<< getSetting CursesLibDir
+         -- ROMES:TODO: how is the Host set to TargetPlatformFull? That would be the target
+         , conf "--host"                   $ arg =<< getSetting TargetPlatformFull
+-        , conf "--with-cc" $ arg =<< getBuilderPath . (Cc CompileC) =<< getStage
+         , ghcVersionH
+         ]
+
+-- 
+2.44.2
diff --git a/dev-haskell/hadrian/files/hadrian-9.4.8-remove-with-cc-configure-flag.patch b/dev-haskell/hadrian/files/hadrian-9.4.8-remove-with-cc-configure-flag.patch
@@ -0,0 +1,25 @@
+From: hololeap <[email protected]>
+Date: Sat, 31 Aug 2024 22:26:34 -0600
+Subject: [PATCH 1/1] Remove --with-cc from configure flags
+
+configure responds with:
+
+    WARNING: unrecognized options: --with-cc
+
+This triggers Gentoo's QA notice, "Unrecognized configure options", when
+building GHC.
+
+Signed-off-by: hololeap <[email protected]>
+--- a/src/Settings/Builders/Cabal.hs
++++ b/src/Settings/Builders/Cabal.hs
+@@ -200,7 +200,6 @@ configureArgs cFlags' ldFlags' = do
+         , conf "--with-gmp-libraries"     $ arg =<< getSetting GmpLibDir
+         , conf "--with-curses-libraries"  $ arg =<< getSetting CursesLibDir
+         , conf "--host"                   $ arg =<< getSetting TargetPlatformFull
+-        , conf "--with-cc" $ arg =<< getBuilderPath . (Cc CompileC) =<< getStage
+         , notStage0 ? arg "--ghc-option=-ghcversion-file=rts/include/ghcversion.h"
+         ]
+
+-- 
+2.44.2
+
diff --git a/dev-haskell/hadrian/hadrian-9.10.1.ebuild b/dev-haskell/hadrian/hadrian-9.10.1.ebuild
@@ -22,6 +22,10 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/ghc-${PV}/${CABAL_PN}"
 CABAL_FILE="${S}/${CABAL_PN}.cabal"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.10.1-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
 	>=dev-haskell/cabal-3.10:=

diff --git a/dev-haskell/hadrian/hadrian-9.4.7-r1.ebuild b/dev-haskell/hadrian/hadrian-9.4.7-r1.ebuild
@@ -26,6 +26,10 @@ CABAL_CHDEPS=(
 	'Cabal                >= 3.2     && < 3.9' 'Cabal >= 3.2'
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.4.8-r1.ebuild b/dev-haskell/hadrian/hadrian-9.4.8-r1.ebuild
@@ -26,6 +26,10 @@ CABAL_CHDEPS=(
 	'Cabal                >= 3.2     && < 3.9' 'Cabal >= 3.2'
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.6.3-r1.ebuild b/dev-haskell/hadrian/hadrian-9.6.3-r1.ebuild
@@ -22,6 +22,10 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/ghc-${PV}/hadrian"
 CABAL_FILE="${S}/hadrian.cabal"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.6.4-r1.ebuild b/dev-haskell/hadrian/hadrian-9.6.4-r1.ebuild
@@ -22,6 +22,10 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/ghc-${PV}/hadrian"
 CABAL_FILE="${S}/hadrian.cabal"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.6.5-r1.ebuild b/dev-haskell/hadrian/hadrian-9.6.5-r1.ebuild
@@ -26,6 +26,10 @@ CABAL_CHDEPS=(
 	'Cabal                >= 3.2     && < 3.9' 'Cabal >= 3.2'
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.6.6.ebuild b/dev-haskell/hadrian/hadrian-9.6.6.ebuild
@@ -26,6 +26,10 @@ CABAL_CHDEPS=(
 	'Cabal                >= 3.2     && < 3.9' 'Cabal >= 3.2'
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
+)
+
 RDEPEND="
 	>=dev-haskell/cabal-3.2:=
 	>=dev-haskell/extra-1.4.7:=

diff --git a/dev-haskell/hadrian/hadrian-9.8.2-r2.ebuild b/dev-haskell/hadrian/hadrian-9.8.2-r2.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-9.8.2-ghc-9_8-boot-compiler-fixes.patch"
+	"${FILESDIR}/${PN}-9.4.8-remove-with-cc-configure-flag.patch"
 )
 
 src_prepare() {