Received: by mail.netbsd.org (Postfix, from userid 605) id 993BC84DA7; Tue, 24 Dec 2019 06:21:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 22C6E84D62 for ; Tue, 24 Dec 2019 06:21:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id RCnQQI34uzb6 for ; Tue, 24 Dec 2019 06:21:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7C52F84CE2 for ; Tue, 24 Dec 2019 06:21:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7A1D3FA97; Tue, 24 Dec 2019 06:21:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1577168480123810" MIME-Version: 1.0 Date: Tue, 24 Dec 2019 06:21:20 +0000 From: "Darrin B. Jewell" Subject: CVS commit: pkgsrc/x11/qt5-qtbase To: pkgsrc-changes@NetBSD.org Reply-To: dbj@netbsd.org X-Mailer: log_accum Message-Id: <20191224062120.7A1D3FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1577168480123810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dbj Date: Tue Dec 24 06:21:20 UTC 2019 Modified Files: pkgsrc/x11/qt5-qtbase: Makefile Log Message: x11/qt5-qtbase: fix darwin compile when headers not in /usr/include To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 pkgsrc/x11/qt5-qtbase/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1577168480123810 Content-Disposition: inline Content-Length: 1002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtbase/Makefile diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.85 pkgsrc/x11/qt5-qtbase/Makefile:1.86 --- pkgsrc/x11/qt5-qtbase/Makefile:1.85 Sun Nov 3 09:14:16 2019 +++ pkgsrc/x11/qt5-qtbase/Makefile Tue Dec 24 06:21:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2019/11/03 09:14:16 rillig Exp $ +# $NetBSD: Makefile,v 1.86 2019/12/24 06:21:20 dbj Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} @@ -92,6 +92,13 @@ LDFLAGS+= -lexecinfo .elif ${OPSYS} == "Darwin" CONFIGURE_ARGS+= -platform macx-clang CONFIGURE_ARGS+= -no-framework + # pkgsrc has a patch to avoid using SDK, but the configure + # logic gets confused if it can't find the header files + # so give it a direct path to them if they aren't installed + # in /usr/include +. if !exists(/usr/include) +CONFIGURE_ARGS+= -I "$$(xcrun --show-sdk-path)"/usr/include +. endif . if exists(/usr/lib/libresolv.dylib) LDFLAGS+= -lresolv . endif --_----------=_1577168480123810--