From owner-svn-ports-head@freebsd.org Tue Apr 16 17:41:45 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A99701578D3C; Tue, 16 Apr 2019 17:41:45 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B5776FC73; Tue, 16 Apr 2019 17:41:45 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: by mail-qt1-x836.google.com with SMTP id z16so24315197qtn.4; Tue, 16 Apr 2019 10:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6Cuzvh0p/5N4Cv1NbeBx3JcYW5x4xvqoxeDwXTzoWTw=; b=cavB+QQD5XP76l8f2qNQEKS7mtBYBLYPMVJSFSHJlaM16U3agGyy4U+LwM43ncHvmh rafTWNS0b0S5fdUecG3HlCHWMvJBKJ1IipnY58ThTVsdY3dopRDNWWvOH3LBqoqPn06N opnHYIMVyiaVOoR2Wnw5yDxvlXd52wFaNYAWNEjnz+hkAtUSZc8Ea8HLgfvFPqreWGqt MJtaGOiaT8JFiPEkyViAfSgWqP6iJ/6J06OnCgBJFZ80x+mtranL2zNQf6G8iLidpjxP Q4nmyrzq7BcLH2huwSwhM3OcA0gMBUbh46X0sSCbeZx7G5z21NB8a5mg3oInQeFae0+L 64DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6Cuzvh0p/5N4Cv1NbeBx3JcYW5x4xvqoxeDwXTzoWTw=; b=EtekZhvouB55ozeBwlqwfa4WoPx7J3AE7LHjF2OxAORo+ngm2SunphTpMSV0AGvKQM FfAFHtjS3GAdSnt4L+06HDUlitiyij5oQEI1SH+cT23fK8LQb4IYVpGxlh0XxntI6NG/ pcdbvsOg628DgboE74s3sB3fe6xSo5EJJDy+VF3nO8GjN8wDopZdpiRK0UebSeWUhlc9 68zUW6+ScUOm8goQ//a3x+wp3MqJvIo6szm0yAQ7RmQm2ieTZ7L6rTR/av7RkEzJ+KnB KGX2xVS2mR08i9PEPlSboUnC2DwWPimaFV08xIMQXfgrnhZPab0v9VtXD9Deggg96Y0N /n1A== X-Gm-Message-State: APjAAAUCl/1laeF4SBFbep68svPiirAAHDjSb1sYnZlmK2PZWiAQM6r1 eBRWG8v2Gk4gy9RApKGmn9oh/QsntNTwe4X95EywGw== X-Google-Smtp-Source: APXvYqw7361wI6du89YBrcHVMKdk9gW8VZZIb8Q8lIzr2Zsq2FDeTNerSSTDhk6I+UigZSNffTPwK85xrV1vP59WyPE= X-Received: by 2002:a0c:b78f:: with SMTP id l15mr65898335qve.160.1555436504290; Tue, 16 Apr 2019 10:41:44 -0700 (PDT) MIME-Version: 1.0 References: <201904161731.x3GHVJ1X030178@repo.freebsd.org> In-Reply-To: <201904161731.x3GHVJ1X030178@repo.freebsd.org> From: "Tobias C. Berner" Date: Tue, 16 Apr 2019 19:41:32 +0200 Message-ID: Subject: Re: svn commit: r499101 - in head: Mk/Uses devel/qt5/files To: Piotr Kubaj Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-Rspamd-Queue-Id: 4B5776FC73 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.99)[-0.987,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 16 Apr 2019 17:41:46 -0000 Moin moin There was a little misunderstanding here. Let's see if it breaks anything or whether we get away with it. mfg Tobias On Tue, 16 Apr 2019 at 19:31, Piotr Kubaj wrote: > Author: pkubaj > Date: Tue Apr 16 17:31:19 2019 > New Revision: 499101 > URL: https://svnweb.freebsd.org/changeset/ports/499101 > > Log: > Fix build when using GCC. Needed by GCC architectures. > > Tested for no breakage on amd64 with Clang. > > PR: 235921 > Reviewed by: tcberner > Approved by: tcberner (mentor) > > Modified: > head/Mk/Uses/qt-dist.mk > head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf > > Modified: head/Mk/Uses/qt-dist.mk > > ============================================================================== > --- head/Mk/Uses/qt-dist.mk Tue Apr 16 17:10:02 2019 (r499100) > +++ head/Mk/Uses/qt-dist.mk Tue Apr 16 17:31:19 2019 (r499101) > @@ -251,8 +251,8 @@ _QT5_BASE= core dbus gui network sql widgets > post-patch: gcc-post-patch > gcc-post-patch: > ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' > ${WRKSRC}/mkspecs/common/gcc-base.conf > - ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' > ${WRKSRC}/mkspecs/common/gcc-base.conf \ > - ${WRKSRC}/mkspecs/common/g++-base.conf > + ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' > ${WRKSRC}/mkspecs/common/gcc-base.conf \ > + ${WRKSRC}/mkspecs/common/g++-base.conf > ${WRKSRC}/mkspecs/common/bsd/bsd.conf > .endif > > pre-configure: qtbase-pre-configure > @@ -323,8 +323,8 @@ qt5-pre-configure: > # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing > them. > # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. > ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > - ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > - ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> > ${CONFIGURE_WRKSRC}/.qmake.cache > + ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib > /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache > + ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include > /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache > > post-install: qt-post-install > qt-post-install: > > Modified: head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf > > ============================================================================== > --- head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 > 17:10:02 2019 (r499100) > +++ head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 > 17:31:19 2019 (r499101) > @@ -1,6 +1,6 @@ > --- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC > +++ mkspecs/common/bsd/bsd.conf > -@@ -21,6 +21,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm > +@@ -21,6 +21,29 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm > QMAKE_LIBS_OPENGL = -lGL > QMAKE_LIBS_THREAD = > > @@ -28,3 +28,5 @@ > QMAKE_AR = ar cqs > QMAKE_OBJCOPY = objcopy > QMAKE_NM = nm -P > ++ > ++EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include > %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++ > >