Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id D280A1A921F for ; Thu, 24 Dec 2020 20:29:16 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7B80C84D67; Thu, 24 Dec 2020 20:29:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B3DFB84D32 for ; Thu, 24 Dec 2020 20:29:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id w-X89CCO2bgN for ; Thu, 24 Dec 2020 20:29:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0C58A84CD8 for ; Thu, 24 Dec 2020 20:29:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id F2E88FA9D; Thu, 24 Dec 2020 20:29:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1608841754223410" MIME-Version: 1.0 Date: Thu, 24 Dec 2020 20:29:14 +0000 From: "Yorick Hardy" Subject: CVS commit: pkgsrc/print/qpdf To: pkgsrc-changes@NetBSD.org Reply-To: yhardy@netbsd.org X-Mailer: log_accum Message-Id: <20201224202914.F2E88FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1608841754223410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: yhardy Date: Thu Dec 24 20:29:14 UTC 2020 Added Files: pkgsrc/print/qpdf: hacks.mk Log Message: print/qpdf: Requires 64-bit atomic operations This (partially) fixes the build on NetBSD/i386 for i586 class processors and NetBSD/powerpc. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/print/qpdf/hacks.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1608841754223410 Content-Disposition: inline Content-Length: 972 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/print/qpdf/hacks.mk diff -u /dev/null pkgsrc/print/qpdf/hacks.mk:1.1 --- /dev/null Thu Dec 24 20:29:14 2020 +++ pkgsrc/print/qpdf/hacks.mk Thu Dec 24 20:29:14 2020 @@ -0,0 +1,23 @@ +# $NetBSD: hacks.mk,v 1.1 2020/12/24 20:29:14 yhardy Exp $ + +.if !defined(QPDF_HACKS_MK) +QPDF_HACKS_MK= defined + +# [Tue Dec 15 15:49:14 SAST 2020 : yhardy] +# On i386 archs libqpdf/QPDF.cc fails to compile because 64-bit atomic +# operations are needed. Forcing -march=i586 (or better) avoids that +# (i[56]86 provide required). +.if ${MACHINE_ARCH} == "i386" +PKG_HACKS+= i386-atomicops +CXXFLAGS+= -march=i586 +.endif + +# [Tue Dec 15 15:49:14 SAST 2020 : yhardy] +# On NetBSD/powerpc, we don't have native 8-byte atomics, but qpdf +# needs it for a global long long counter, so here we need libatomic. +.if ${MACHINE_ARCH} == "powerpc" +PKG_HACKS+= powerpc-libatomic +.include "../../devel/libatomic/buildlink3.mk" +.endif + +.endif # QPDF_HACKS_MK --_----------=_1608841754223410--