From owner-svn-ports-head@freebsd.org Mon Sep 21 19:26:13 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A96033F9BD9; Mon, 21 Sep 2020 19:26:13 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwDv945Q2z3Tjq; Mon, 21 Sep 2020 19:26:13 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6FCB0135EA; Mon, 21 Sep 2020 19:26:13 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08LJQDe2043741; Mon, 21 Sep 2020 19:26:13 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08LJQDtr043740; Mon, 21 Sep 2020 19:26:13 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202009211926.08LJQDtr043740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 21 Sep 2020 19:26:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549483 - in head/converters/wkhtmltopdf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head/converters/wkhtmltopdf: . files X-SVN-Commit-Revision: 549483 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2020 19:26:13 -0000 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 +=