From owner-svn-ports-head@freebsd.org Sat Jan 25 12:05:38 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 08D5423DB40; Sat, 25 Jan 2020 12:05:38 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 484ZTY4l8qz4R48; Sat, 25 Jan 2020 12:05:37 +0000 (UTC) (envelope-from tobik@freebsd.org) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id ACBEF2268A; Sat, 25 Jan 2020 07:05:36 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Sat, 25 Jan 2020 07:05:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=AfyqN4 LJtS/AWsztTKFgcSPBWEHoeBf76ToRrcOB7OA=; b=eGHhs7RbQ8Ss/3kURoEIK8 pmBfFoGCnd3WIbqWP/0hezO4oZtDFYEl4nECqVXiekhtFFNrSTTMqWAoUqcRt8jw I/3/sVhEJD8BPpbQ7H6XqpQ3mkYUhzUwuq4A5Nr5Bhavh+b1IenERci+LeCR5Kx/ elvMxev6sSVVqJgUb4hd1AWk/w26Ij4zU5uOJ60OtyM7jOHQjxeDE1lbunl90P8+ ZCPKCA1bnFQDQPZvEqzDQMSn5W6Lsyk/AG7uoVNFfSfy8r/pJozHjlgfgb6lj4iz S8wwfWaB1mQhZbguCOn1Fk0SZOZ9C/hMSN9Ab7NjNFzkm9lmwjqP7JKmeHBN73Iw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrvdejgdefiecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujgesghdtreertddtvdenucfhrhhomhepvfhosghirghs ucfmohhrthhkrghmphcuoehtohgsihhksehfrhgvvggsshgurdhorhhgqeenucffohhmrg hinhepfhhrvggvsghsugdrohhrghdpphhrvgdrmhhkpdhophhtihhonhhsrdhmkhenucfk phepleehrdeltddrvddviedrudejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomhepthhosghikhesfhhrvggvsghsugdrohhrgh X-ME-Proxy: Received: from urd.tobik.me (ip5f5ae211.dynamic.kabel-deutschland.de [95.90.226.17]) by mail.messagingengine.com (Postfix) with ESMTPA id E7A7B328005A; Sat, 25 Jan 2020 07:05:35 -0500 (EST) Date: Sat, 25 Jan 2020 13:05:34 +0100 From: Tobias Kortkamp To: Piotr Kubaj Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r523930 - head/graphics/tesseract Message-ID: <20200125120534.GA83740@urd.tobik.me> References: <202001231314.00NDEhSi060339@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="a8Wt8u1KmwUX3Y2C" Content-Disposition: inline In-Reply-To: <202001231314.00NDEhSi060339@repo.freebsd.org> X-Rspamd-Queue-Id: 484ZTY4l8qz4R48 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.90 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; NEURAL_HAM_LONG(-0.93)[-0.930,0] 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: Sat, 25 Jan 2020 12:05:38 -0000 --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 23, 2020 at 01:14:43PM +0000, Piotr Kubaj wrote: > Author: pkubaj > Date: Thu Jan 23 13:14:43 2020 > New Revision: 523930 > URL: https://svnweb.freebsd.org/changeset/ports/523930 >=20 > Log: > graphics/tesseract: use correct check for libomp > =20 > FreeBSD 11.3 has libomp. > =20 > Reported by: sunpoet >=20 > Modified: > head/graphics/tesseract/Makefile >=20 > Modified: head/graphics/tesseract/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/graphics/tesseract/Makefile Thu Jan 23 13:09:37 2020 (r523929) > +++ head/graphics/tesseract/Makefile Thu Jan 23 13:14:43 2020 (r523930) > @@ -51,7 +51,7 @@ TOOLS_USE=3D GNOME=3Dcairo,glib20,pango > =20 > .include > =20 > -.if ${OSVERSION} < 1201000 > +.if ${CHOSEN_COMPILER_TYPE} =3D=3D clang && !exists(/usr/include/omp.h) > OPENMP_LIB_DEPENDS=3Dlibomp.so:devel/openmp > .endif > =20 This only fixes part of the problem. Changing the condition does not change the fact that options helper cannot be defined after bsd.port.options.mk/bsd.port.pre.mk if you want them to do something. The framework also warns about this (assuming the condition is true): $ make -C graphics/tesseract WITH=3DOPENMP check-sanity /!\ tesseract-4.1.1: Makefile errors /!\ The following options helpers are incorrectly set after bsd.port.options.mk and are ineffective: OPENMP_LIB_DEPENDS $ make -C graphics/tesseract -V 'LIB_DEPENDS:Mlibomp*' WITH=3DOPENMP $ You could do it like this: Index: graphics/tesseract/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- graphics/tesseract/Makefile (revision 524015) +++ graphics/tesseract/Makefile (working copy) @@ -51,8 +51,8 @@ =20 .include =20 -.if ${CHOSEN_COMPILER_TYPE} =3D=3D clang && !exists(/usr/include/omp.h) -OPENMP_LIB_DEPENDS=3Dlibomp.so:devel/openmp +.if ${PORT_OPTIONS:MOPENMP} && ${CHOSEN_COMPILER_TYPE} =3D=3D clang && !ex= ists(/usr/include/omp.h) +LIB_DEPENDS+=3D libomp.so:devel/openmp .endif =20 post-patch: --a8Wt8u1KmwUX3Y2C Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEElXvTEJc6ePgdQuobpPCftzzFH2EFAl4sLwtfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDk1 N0JEMzEwOTczQTc4RjgxRDQyRUExQkE0RjA5RkI3M0NDNTFGNjEACgkQpPCftzzF H2HZTAf/ej/NDIIiDzrY2Jz+Ywdrzm+bEm/+dxOV6I7bTGiYjxdDzo/8rUHn+0Bk 4FRJaepZVu8Ereu5of7DQHPRdG/7ciS58uAHrV5Dfl6m4QWyjI1uKA9ppWJuCOrO AopsUbClFF9vxSBFDK7CmSU5xPyw/0e2CcV8tROZH5OXXFbXd4GJFlOXwzlzmULd XFTyvClNTGtHj5MsISx1ac+7IKkq8AvsEL4928GYbq/yRdCOXZB3OqLbGA4dwxIN CHnDmOoE9jQ29qOn4Fb50nkwkfDboJvXEjP+pXSHhLRColcHZFsXu3vjyYtjkfZP B0MO2g4WU2r5/NqfrwAIlyiDVQ+Hmg== =3SyO -----END PGP SIGNATURE----- --a8Wt8u1KmwUX3Y2C--