pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gcc14-gnat: fix gettext and iconv dependencies



Module Name:	pkgsrc-wip
Committed By:	Dmytro Kazankov <dmytro.kazankov%gmail.com@localhost>
Pushed By:	dkazankov
Date:		Mon Feb 24 17:29:24 2025 +0200
Changeset:	002d34118788a7397f18a1f3cdc6c1baa477b7ff

Modified Files:
	gcc14-gnat/Makefile
	gcc14-gnat/options.mk

Log Message:
gcc14-gnat: fix gettext and iconv dependencies

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=002d34118788a7397f18a1f3cdc6c1baa477b7ff

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc14-gnat/Makefile   | 2 +-
 gcc14-gnat/options.mk | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/gcc14-gnat/Makefile b/gcc14-gnat/Makefile
index 7e3c60288d..6452e5a3c2 100644
--- a/gcc14-gnat/Makefile
+++ b/gcc14-gnat/Makefile
@@ -23,7 +23,7 @@ CHECK_RELRO_SUPPORTED=	no
 NOT_FOR_PLATFORM+=	Interix-*-*
 
 USE_LANGUAGES=		c c++ ada
-USE_TOOLS+=		gmake makeinfo sed:run tar perl
+USE_TOOLS+=		gmake makeinfo sed perl
 USE_TOOLS.NetBSD+=	gsed
 
 GNU_CONFIGURE=		yes
diff --git a/gcc14-gnat/options.mk b/gcc14-gnat/options.mk
index a52a1cee03..0e10a18d2b 100644
--- a/gcc14-gnat/options.mk
+++ b/gcc14-gnat/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD: options.mk,v 1.1 2024/03/08 12:02:33 wiz Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc13-gnat
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gcc14-gnat
 PKG_SUPPORTED_OPTIONS=	nls gcc-inplace-math gcc-graphite
 PKG_SUGGESTED_OPTIONS=	gcc-graphite
 
@@ -45,12 +45,15 @@ PKG_SUGGESTED_OPTIONS+=	gcc-multilib
 ### Native Language Support
 ###
 .if !empty(PKG_OPTIONS:Mnls)
-USE_TOOLS+=		msgfmt
 CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 MAKE_ENV+=		ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
+PREFER.iconv=		pkgsrc
 .include "../../converters/libiconv/buildlink3.mk"
+PREFER.gettext=		pkgsrc
 .include "../../devel/gettext-lib/buildlink3.mk"
+PLIST.nls=	yes
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
 .else
 CONFIGURE_ARGS+=	--disable-nls
 .endif
@@ -76,6 +79,7 @@ CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
 CONFIGURE_ARGS+=	--with-mpc=${BUILDLINK_PREFIX.mpcomplex}
 CONFIGURE_ARGS+=	--with-mpfr=${BUILDLINK_PREFIX.mpfr}
 LIBS.SunOS+=		-lgmp
+
 .  include "../../devel/gmp/buildlink3.mk"
 .  include "../../math/mpcomplex/buildlink3.mk"
 .  include "../../math/mpfr/buildlink3.mk"


Home | Main Index | Thread Index | Old Index