From nobody Mon Aug 08 16:15:46 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4M1hBq0gD8z4YQWn; Mon, 8 Aug 2022 16:15:47 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M1hBq086dz3HK4; Mon, 8 Aug 2022 16:15:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659975347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/kfpIkI9AVsrWdsOdhNrZc/QoZ3zMLW0hHqepD4ZIEA=; b=Ai04fxCQzLi5E9GDUEBVoEuoEw6HagLe1MGU8/L0047BU/QLO+Wh6m/LoH4cxlkhMsPgSk 0eIS7hlFj5FAbIyWI89iYL2omYDnUnL+osY6E+pZ41aRAZh5HF1euQSpVhNBhZ4SwtrQ4r sx4/zo5Jjaxn8V+VJo9lBBV6Ofb6hh5k5fIS7zrQeJUyerain0jsJUnbmHVyV40tH+llWn 7kiAFnJk3aYzNiRgdF5M6q6dHJQ83I/ZRK80H3784MS7SAvHBMd64dv6U+HUN4P6h9mKzG vS0qdTxyZw1B9oT92Aj1uHrEtFi5aeydiT8fzXoTuZaafR1GMOXtM5z0sTGeDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M1hBp6JS0zxZV; Mon, 8 Aug 2022 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 278GFkkQ065464; Mon, 8 Aug 2022 16:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 278GFk0B065463; Mon, 8 Aug 2022 16:15:46 GMT (envelope-from git) Date: Mon, 8 Aug 2022 16:15:46 GMT Message-Id: <202208081615.278GFk0B065463@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 183c0e2bc813 - main - math/reduce: Fix build on armv6, aarch64; Enable on powerpc64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 183c0e2bc8137958e026e990c0fef99b74b45168 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659975347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/kfpIkI9AVsrWdsOdhNrZc/QoZ3zMLW0hHqepD4ZIEA=; b=hN3N+hQld7+XgNrXJNHQzNG6QB2mXVXJDN2iHNRSa68bZIAAAdFDa8L+LBeRGsTp/CNE4U 2AEs+0+csVph820apEDQprrt3MC0gnufriRoUMCjlFcTeMQkekI6xuFhG/d3/Y6RARCd/9 pb3xTmrLljXtKU8XHZMC6EaF3X0BrMmIatkitH37ewOEGttUwuD3/JsT5f90Nhp1iNO6YY XoDYfzZNm0eN6KWe4bEjSe4F505N+G2wy1ay/oN3N2w72m85eyOFXYQJdDKgG+8WqS4y3u Ah+bJV0MPbN13sPuM7amr6oACZCKgjekviQhXLBckwnIYLCPITodPbheI9jgrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659975347; a=rsa-sha256; cv=none; b=IYwIRbrmKduekXrvhF4EKbNfnitm2M/3iyQ48L84jTw9rZriRAj82botazSPWnEfC1HUQI H/Zfxy7aBZdb+QfOAuQmn6R5oIzQGHiMPcqvqcfxwrrYDoW7R/IhUiA+GV62FtPsqXNYEY lNmVuAvoTh5iXkZJLopgFLpn5nicVQsusphVAQ2wDOBnJKMNZcpXYmuXcZ/zkltiGZ2+rs cSfc3geFfXQ+lvkciRHXnHuoaGFchqrWuS6ffN4EEkXyjQrYFUI0ZF6vocJe+sTqOQLTCY 9CMUI59MsJyeUA5G6+JT0C3PqmOPLsNM/LNnd4oEwM/5m2GpnPzI89uv+xGZ/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=183c0e2bc8137958e026e990c0fef99b74b45168 commit 183c0e2bc8137958e026e990c0fef99b74b45168 Author: Yuri Victorovich AuthorDate: 2022-08-08 16:13:44 +0000 Commit: Yuri Victorovich CommitDate: 2022-08-08 16:15:44 +0000 math/reduce: Fix build on armv6, aarch64; Enable on powerpc64 It was failing with 'wcwidth' related message. --- math/reduce/Makefile | 2 -- .../reduce/files/patch-generic_newfront_redfront.h | 26 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/math/reduce/Makefile b/math/reduce/Makefile index e598f3d2edac..1dda4866d5f4 100644 --- a/math/reduce/Makefile +++ b/math/reduce/Makefile @@ -9,9 +9,7 @@ COMMENT= Codemist Standard Lisp REDUCE general-purpose computer system LICENSE= BSD2CLAUSE -BROKEN_armv6= fails to compile: redfront.h:118:12: conflicting types for '__wcwidth' BROKEN_i386= fails to compile: sysv.S:832:1: changed section flags for .eh_frame, expected: 0x2 -BROKEN_powerpc64= fails to compile: arith01.cpp: 'statuc' does not name a type BUILD_DEPENDS= gnuplot:math/gnuplot LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ diff --git a/math/reduce/files/patch-generic_newfront_redfront.h b/math/reduce/files/patch-generic_newfront_redfront.h new file mode 100644 index 000000000000..83ed9bd1f793 --- /dev/null +++ b/math/reduce/files/patch-generic_newfront_redfront.h @@ -0,0 +1,26 @@ +- fix of this failure on arm64: +- +- In file included from /wrkdirs/usr/ports/math/reduce/work/Reduce-svn6339-src/generic/newfront/redchild.c:31: +- /wrkdirs/usr/ports/math/reduce/work/Reduce-svn6339-src/generic/newfront/redfront.h:118:12: error: conflicting types for '__wcwidth' +- extern int wcwidth(wchar_t c); +- ^ +- /usr/include/wchar.h:213:21: note: expanded from macro 'wcwidth' +- #define wcwidth(_c) __wcwidth(_c) +- ^ +- /usr/include/_ctype.h:161:1: note: previous definition is here +- __wcwidth(__ct_rune_t _c) +- ^ +- 1 error generated. + +--- generic/newfront/redfront.h.orig 2021-03-16 10:41:22 UTC ++++ generic/newfront/redfront.h +@@ -115,7 +115,9 @@ typedef void (*sig_t)(int); + */ + #ifndef NATIVE_WINDOWS + #include "sys.h" ++# if !defined(__FreeBSD__) + extern int wcwidth(wchar_t c); ++# endif + #include "chartype.h" + #endif +