From owner-svn-ports-all@freebsd.org Thu Aug 6 15:44:24 2020 Return-Path: Delivered-To: svn-ports-all@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 1C6D63A5737; Thu, 6 Aug 2020 15:44:24 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BMt8S007Jz4GjZ; Thu, 6 Aug 2020 15:44:23 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D70229688; Thu, 6 Aug 2020 15:44:23 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 076FiN28028649; Thu, 6 Aug 2020 15:44:23 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 076FiNRI028648; Thu, 6 Aug 2020 15:44:23 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202008061544.076FiNRI028648@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 6 Aug 2020 15:44:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544280 - head/math/py-or-tools X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/math/py-or-tools X-SVN-Commit-Revision: 544280 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2020 15:44:24 -0000 Author: yuri Date: Thu Aug 6 15:44:23 2020 New Revision: 544280 URL: https://svnweb.freebsd.org/changeset/ports/544280 Log: math/py-or-tools: Broken on i386; Make file mask more inclusive to fix build on some architectures Reported by: fallout Modified: head/math/py-or-tools/Makefile Modified: head/math/py-or-tools/Makefile ============================================================================== --- head/math/py-or-tools/Makefile Thu Aug 6 15:19:43 2020 (r544279) +++ head/math/py-or-tools/Makefile Thu Aug 6 15:44:23 2020 (r544280) @@ -13,6 +13,8 @@ COMMENT= Google's Operations Research tools (Python bi LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE-2.0.txt +BROKEN_i386= SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130 + PY_DEPENDS= ${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} \ @@ -46,7 +48,7 @@ post-configure: # https://github.com/google/or-tools/i do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \ - unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}.9999-cp${PYTHON_SUFFIX}-cp${PYTHON_SUFFIX}m-freebsd_*.whl && \ + unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \ ${RM} -rf ortools-*.dist-info ${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD}