Date: Sat, 13 Jul 2019 02:29:46 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Mark Linimon <linimon@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r506498 - in head: devel/py-lxml editors/encryptpad games/lpairs graphics/comical lang/harbour mail/archiveopteryx mail/archiveopteryx-devel multimedia/oscam news/nget Message-ID: <20190713002946.GA99641@ThinkPad-X200.g.anongoth.pl> In-Reply-To: <201907130007.x6D07Z4Z010235@repo.freebsd.org> References: <201907130007.x6D07Z4Z010235@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--2QVanySbh1jmLoeq Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Why not put USES=compiler:c11 for those ports where you set USE_GCC=yes after checking whether we use base GCC? On 19-07-13 00:07:35, Mark Linimon wrote: >Author: linimon >Date: Sat Jul 13 00:07:35 2019 >New Revision: 506498 >URL: https://svnweb.freebsd.org/changeset/ports/506498 > >Log: > Prepare for powerpc-on-clang by deleting hard-coded tests for architecture > as a stand-in for "are we running on gcc". > > Approved by: portmgr (tier-2 blanket) > >Modified: > head/devel/py-lxml/Makefile > head/editors/encryptpad/Makefile > head/games/lpairs/Makefile > head/graphics/comical/Makefile > head/lang/harbour/Makefile > head/mail/archiveopteryx-devel/Makefile > head/mail/archiveopteryx/Makefile > head/multimedia/oscam/Makefile > head/news/nget/Makefile > >Modified: head/devel/py-lxml/Makefile >============================================================================== >--- head/devel/py-lxml/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/devel/py-lxml/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -13,7 +13,7 @@ COMMENT= Pythonic binding for the libxml2 and libxslt > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/doc/licenses/BSD.txt > >-USES= gnome python uniquefiles:dirs >+USES= compiler gnome python uniquefiles:dirs > USE_GNOME= libxml2 libxslt > USE_PYTHON= autoplist concurrent distutils > >@@ -35,8 +35,8 @@ post-install-DOCS-on: > > .include <bsd.port.pre.mk> > >-# on gcc-based architectures, use modern GCC due to use of #pragma >-.if ${ARCH} == mips || ${ARCH} == mips64 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpcspe || ${ARCH} == sparc64 >+# if using gcc, force modern GCC due to use of #pragma >+.if ${CHOSEN_COMPILER_TYPE} == gcc > USE_GCC= yes > .endif > > >Modified: head/editors/encryptpad/Makefile >============================================================================== >--- head/editors/encryptpad/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/editors/encryptpad/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -33,7 +33,7 @@ PORTDOCS= * > .include <bsd.port.pre.mk> > > post-patch: >-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == gcc > ${REINPLACE_CMD} -e 's/freebsd-clang/freebsd-g++/' \ > ${WRKSRC}/build/Makefile.qt_ui > .endif > >Modified: head/games/lpairs/Makefile >============================================================================== >--- head/games/lpairs/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/games/lpairs/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -35,7 +35,7 @@ NLS_CONFIGURE_ENABLE= nls > > post-patch: > ${REINPLACE_CMD} -e 's|games/lpairs|lpairs|' ${WRKSRC}/configure.in >-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == gcc > ${REINPLACE_CMD} -e 's|-Wno-unused-result||' ${WRKSRC}/configure.in > .endif > > >Modified: head/graphics/comical/Makefile >============================================================================== >--- head/graphics/comical/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/graphics/comical/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -41,7 +41,7 @@ PLIST_FILES= bin/comical \ > pre-patch: > @${MV} ${WRKSRC}/Comical\ Icons ${WRKSRC}/ComicalIcons > >-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == gcc > pre-configure: > ${REINPLACE_CMD} -e 's|-Wno-unused-local-typedef||' ${WRKSRC}/src/Makefile > .endif > >Modified: head/lang/harbour/Makefile >============================================================================== >--- head/lang/harbour/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/lang/harbour/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -27,7 +27,7 @@ LIB_DEPENDS= libslang.so:devel/libslang2\ > BUILD_DEPENDS= bash:shells/bash > RUN_DEPENDS:= ${BUILD_DEPENDS} > >-USES= bison gmake shebangfix ssl >+USES= bison compiler gmake shebangfix ssl > > SHEBANG_FILES= bin/hb3rdpat.hbs > SHEBANG_LANG= hbrun >@@ -122,7 +122,7 @@ post-patch: > -e 's|utmp.h|utmpx.h|g' ${WRKSRC}/src/rtl/gtcrs/gtcrs.h > > # override default for gcc-based archs >-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == gcc > HB_COMPILER= gcc > .endif > > >Modified: head/mail/archiveopteryx-devel/Makefile >============================================================================== >--- head/mail/archiveopteryx-devel/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/mail/archiveopteryx-devel/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -19,7 +19,7 @@ GH_ACCOUNT= aox > GH_PROJECT= aox > GH_TAGNAME= 96ab17e > >-USES= perl5 ssl >+USES= compiler perl5 ssl > USE_PERL5= build > WITH_PGSQL= client > >@@ -44,7 +44,7 @@ OPTIONS_DEFINE= DOCS > > # force Clang when on FreeBSD with clang in base > .if ${OPSYS} == FreeBSD >-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == clang > JAMARG+= "-sCLANG=1" > .endif > .endif > >Modified: head/mail/archiveopteryx/Makefile >============================================================================== >--- head/mail/archiveopteryx/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/mail/archiveopteryx/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -14,7 +14,7 @@ LICENSE= MIT > > BUILD_DEPENDS= jam:devel/jam > >-USES= perl5 ssl tar:bzip2 >+USES= compiler perl5 ssl tar:bzip2 > USE_PERL5= build > WITH_PGSQL= client > >@@ -38,7 +38,7 @@ OPTIONS_DEFINE= DOCS > > # force Clang when on FreeBSD with clang in base > .if ${OPSYS} == FreeBSD >-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == clang > JAMARG+= "-sCLANG=1" > .endif > .endif > >Modified: head/multimedia/oscam/Makefile >============================================================================== >--- head/multimedia/oscam/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/multimedia/oscam/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -12,7 +12,7 @@ COMMENT= Softcam software to decrypt digital tv channe > > LICENSE= GPLv3 > >-USES= gmake ssl tar:bzip2 >+USES= compiler gmake ssl tar:bzip2 > USE_RC_SUBR= oscam > > .if target(gen-dist) >@@ -30,7 +30,7 @@ BROKEN_FreeBSD_12= field has incomplete type 'BIGNUM' > BROKEN_FreeBSD_13= field has incomplete type 'BIGNUM' (aka 'struct bignum_st') > .endif > >-.if ! ${ARCH:Mmips*} && ! ${ARCH:Mpowerpc*} && ! ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == clang > MAKE_ARGS+= HOSTCC=clang CC=clang > .endif > > >Modified: head/news/nget/Makefile >============================================================================== >--- head/news/nget/Makefile Fri Jul 12 23:58:22 2019 (r506497) >+++ head/news/nget/Makefile Sat Jul 13 00:07:35 2019 (r506498) >@@ -29,7 +29,7 @@ WRKSRC= ${WRKDIR}/nget-${PORTVERSION} > > .include <bsd.port.pre.mk> > >-.if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 >+.if ${CHOSEN_COMPILER_TYPE} == gcc > CXXFLAGS+= -std=c++11 > .else > CXXFLAGS+= -std=c++98 > --2QVanySbh1jmLoeq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEycyIeNkkgohzsoorelmbhSCDnJ0FAl0pJfpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEM5 Q0M4ODc4RDkyNDgyODg3M0IyOEEyQjdBNTk5Qjg1MjA4MzlDOUQACgkQelmbhSCD nJ3cAxAAk5kQTt98kULfY8MyshZH/YUHCc3ZIkW07IZe7x4JGXLnUVVysJkLk2WR dicC/gUIZZYG+g7zp9k95l/ht9iDze10wA6qpLlE3lUY+ZPym7u6rl/NdMbdXP8D Q8bRGkmfh9aKZUoYPoS95bRZ2I1w8wozR9TuyYMNkxTwdBx0pnLdLH0EZv5tEJxy XN1eR3kj1+NJBxpqlTF9qHG33dT/T0+CN72ISg6+DBkEOYLJHs0LituUXtWz6am3 wRumPGkza6ZnBbU0W6260PZjQzFuws594y83UqQ/kntlc9CIb6ZmnfnHlNjaVh/8 yCWtybgbmwM+V1tq1FvDTCSvxQEGaNXQbg4FS6JK/HaLmmuX6DYSGKkRPlreQDo9 ae5R0Pf5TH1F4j3vc5PnP5T3VGIMwlMyl0LmzS+GaAb/9WQ64iRXD1UhRyi2aiBY dtdl1rSKPriAyrn/Ujkfw8Yf3DTggnfH5HViRODBSH6moI3HttmkgTihaw9IV81d lwFeMxbtoekSHm+GYMxQyxmGaRe8MfzTWJ2+hPwh2cISOoRQUOchnbnwhMzQ/wQb F8Fg+J87GH5fyIXUPdA0q2qkUthG7Fy4p47KtzcoQCFktuPH7OA5jF6ORkOocb1k g/TPiECQV0j3DtYzNOOSY4envpKk2ZeIB/vkuyzWVxiUTiR5gSw= =EZz6 -----END PGP SIGNATURE----- --2QVanySbh1jmLoeq--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190713002946.GA99641>