Date: Mon, 21 Sep 2020 19:26:13 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549483 - in head/converters/wkhtmltopdf: . files Message-ID: <202009211926.08LJQDtr043740@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Sep 21 19:26:12 2020 New Revision: 549483 URL: https://svnweb.freebsd.org/changeset/ports/549483 Log: converters/wkhtmltopdf: fix build on GCC architectures USES=compiler:c++11-lang overwrites USE_GCC=8. The patch adding LDFLAGS for gcc is missing. Added: head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf (contents, props changed) Modified: head/converters/wkhtmltopdf/Makefile Modified: head/converters/wkhtmltopdf/Makefile ============================================================================== --- head/converters/wkhtmltopdf/Makefile Mon Sep 21 19:24:48 2020 (r549482) +++ head/converters/wkhtmltopdf/Makefile Mon Sep 21 19:26:12 2020 (r549483) @@ -21,7 +21,7 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png -USES= compiler:c++11-lang gmake iconv jpeg perl5 pkgconfig ssl xorg +USES= gmake iconv jpeg perl5 pkgconfig ssl xorg USE_GCC= 8 USE_XORG= x11 xext xrender USE_PERL5= build @@ -66,7 +66,6 @@ post-patch: -e 's|/usr/X11R6/lib|${LOCALBASE}/lib|g' \ ${PATCH_WRKSRC}/mkspecs/freebsd-g++/qmake.conf ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ ${PATCH_WRKSRC}/mkspecs/common/gcc-base.conf ${REINPLACE_CMD} -e "s|gcc|${CC}|g" -e "s|g++|${CXX}|g" \ ${PATCH_WRKSRC}/mkspecs/common/g++-base.conf Added: head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/converters/wkhtmltopdf/files/patch-mkspecs_common_gcc-base.conf Mon Sep 21 19:26:12 2020 (r549483) @@ -0,0 +1,11 @@ +--- mkspecs/common/gcc-base.conf.orig 2020-09-02 16:07:46 UTC ++++ mkspecs/common/gcc-base.conf +@@ -53,7 +53,7 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB + QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC + QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden + +-QMAKE_LFLAGS += ++QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc8 + QMAKE_LFLAGS_DEBUG += + QMAKE_LFLAGS_APP += + QMAKE_LFLAGS_RELEASE +=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009211926.08LJQDtr043740>