git: 83f9c8601b1d - main - converters/wkhtmltopdf: Always build with default GCC
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 04 Dec 2023 11:49:07 UTC
The branch main has been updated by salvadore:
URL: https://cgit.FreeBSD.org/ports/commit/?id=83f9c8601b1dfcfc6025ac27c26ea95cd3c47737
commit 83f9c8601b1dfcfc6025ac27c26ea95cd3c47737
Author: Lorenzo Salvadore <salvadore@FreeBSD.org>
AuthorDate: 2023-11-23 15:45:25 +0000
Commit: Lorenzo Salvadore <salvadore@FreeBSD.org>
CommitDate: 2023-12-04 11:48:58 +0000
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
Approved by: pi (maintainer)
---
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