Attachment 246525 Details for Bug 269313 – Always use default GCC

[patch] Always use default GCC

0001-converters-wkhtmltopdf-Always-build-with-default-GCC.patch (text/plain), 1.46 KB, created by Lorenzo Salvadore on 2023-11-23 20:15:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lorenzo Salvadore

Created: 2023-11-23 20:15:11 UTC

Size: 1.46 KB

patch

obsolete

>From 1739e33a88e41634b999d33af708cd5da8e25875 Mon Sep 17 00:00:00 2001
>From: Lorenzo Salvadore <salvadore@FreeBSD.org>
>Date: Thu, 23 Nov 2023 15:45:25 +0000
>Subject: [PATCH 1/2] converters/wkhtmltopdf: Always build with default GCC
>
>- Building with the default GCC version (12) always works.
>- GCC 13, soon to become the default GCC version, also works.
>- It simplifies the port.
>- The port will not build with llvm 16.
>
>PR:		269313
>---
> converters/wkhtmltopdf/Makefile | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
>diff --git a/converters/wkhtmltopdf/Makefile b/converters/wkhtmltopdf/Makefile
>index bbff58274f82..97a70a82afad 100644
>--- a/converters/wkhtmltopdf/Makefile
>+++ b/converters/wkhtmltopdf/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	wkhtmltopdf
> PORTVERSION=	0.12.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	converters
> 
> MAINTAINER=	pi@FreeBSD.org
>@@ -20,7 +20,8 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libpng.so:graphics/png
> 
>-USES=		compiler gmake iconv jpeg perl5 pkgconfig ssl xorg
>+USES=		gmake iconv jpeg perl5 pkgconfig ssl xorg
>+USE_GCC=	yes
> USE_XORG=	x11 xext xrender
> USE_PERL5=	build
> USE_LDCONFIG=	yes
>@@ -56,10 +57,6 @@ MAKE_ARGS=	INSTALL_ROOT="${STAGEDIR}${PREFIX}"
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${CHOSEN_COMPILER_TYPE} == gcc
>-USE_GCC=	10
>-.endif
>-
> pre-patch:
> 	${RMDIR} ${WRKSRC}/qt
> 	${LN} -s ../qt-${WKQT_TAGNAME} ${WRKSRC}/qt
>-- 
>2.42.0
>

Flags:

salvadore: maintainer-approval? (pi)

Actions: View | Diff

Attachments on bug 269313: 240418 | 246442 | 246446 | 246525