From nobody Thu Jan 20 22:44:37 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 43B40196C1FC; Thu, 20 Jan 2022 22:44:38 +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 4JfyHp1PHKz3v4x; Thu, 20 Jan 2022 22:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642718678; 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=INpBIR8zPx78aPP3wjvtYyISa029ew97zwTSJp8IhrY=; b=waXaWQ9GAJxvBvRo7FMxQDjXDD1GEJ9x1yA7cD71a5TqPJxAGEKJ/Tx4sOWH6ASlp0NwF3 u+Xs8qveqVsVyjTOg4tTPKDaDwp/JUgCh4EHQBzojItuqWKfSC8eU1cEYbLCWuPvymutDV eqpbCj3oqLQvZsqnr1hWtT0VS1RiND7IrlyqQk2n+fmtJiGFZ2PnNTtOxBjrS5bcZmG0wd QJzgyyEpZ+jRI7XAfY1K7B0nupVs8N7Q0n7qHXM0qPIHrJJBX0LFpqhkWCn2CLPA6/GCR0 Mtv0DKata1AOlB8Ez3GhOnHzmW5DjdQ+RmeNg28iuTboGmWmo29xx8rq2Y+n0w== 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 0C68810DC1; Thu, 20 Jan 2022 22:44:38 +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 20KMibQv006978; Thu, 20 Jan 2022 22:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KMib0s006977; Thu, 20 Jan 2022 22:44:37 GMT (envelope-from git) Date: Thu, 20 Jan 2022 22:44:37 GMT Message-Id: <202201202244.20KMib0s006977@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 47d8fb3af3f0 - main - x11/cde: Fix armv7 build 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47d8fb3af3f0e411edcb06a9c694813404c8fe39 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642718678; 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=INpBIR8zPx78aPP3wjvtYyISa029ew97zwTSJp8IhrY=; b=wx7fES7mC79/IgvL5Z3i4fDDicTX9Ip8/BPFj0d1AeCg5SV5OssZYMQ3CUtW/ETSW5AaRS nq8DiKmHDaKNsFbmJaKB6Js0BxH2d7xEXl/0HEvTOGkO42hCL7LwKvdaw6tOuH5OU4tfue /FMzr2NJcGS3O6WFvf8Azy69YUA1pch67d4ujngkAkoFvlnS8fNfGfYw39NmhpWNTfo0hX Qy0VeHaW+RQ12nZVBHskAmezlZMKRT8bZ54+8kTog2tkI4zG5rk8ell23vQB22M4GWplKX pbwKAbpm/d/VNCMArIezocYLLqhmGixeRTdLy4xozj8snIbfxT8yVw3KpUxUaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642718678; a=rsa-sha256; cv=none; b=RiV4zDTKhpIjWfoS2pk8S1JngMfl3uVu+uoD6t+BNBNyhzFA+GZh+rznkw87bGmP2L1ypQ hK6eB+tReO4kuolJzqDLwVTkAxH6BQmFFFRvExbabcjeIB6vJDa9eCtO02Lc2bSny06rUv lTz7bctTl6Sc+6LB/Msy+oye1PNuV+Cm2UvroIUEEyoo5O7s8C8KmuTXlnudcSD9FfhOrX 2ZQnZ+1c+ayffO1G6GLSq+AdVRUOsMJVcwqPJj9xroARB56/LHNIqQWtnh1SHJ01DEAOye fX7ByFU1WYywDxcTVRWqh8hmLAe3AKn28uCDOOozEMjAmA8WXLaQyXVdGkLZVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=47d8fb3af3f0e411edcb06a9c694813404c8fe39 commit 47d8fb3af3f0e411edcb06a9c694813404c8fe39 Author: Cy Schubert AuthorDate: 2022-01-20 21:20:59 +0000 Commit: Cy Schubert CommitDate: 2022-01-20 22:44:30 +0000 x11/cde: Fix armv7 build In attempting to fix powerpc64le, c66a851d13783558a8fa17ffcf64759a0c1b5bab broke armv7. Fix it. PR: 261359 Reported by: Robert Clausecker Fixes: c66a851d13783558a8fa17ffcf64759a0c1b5bab --- x11/cde/Makefile | 8 +++++++- ...h-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c | 15 ++++++++++----- ...h-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c | 15 ++++++++++----- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/x11/cde/Makefile b/x11/cde/Makefile index a87ec364b298..564a5e54c419 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -40,6 +40,12 @@ MAKE_JOBS_UNSAFE=yes SUB_FILES= pkg-message LDFLAGS+= -z muldefs #--allow-multiple-definition +.include + +.if ${ARCH} == powerpc64le +CPPFLAGS+= -DPOWERPC64LE +.endif + post-patch: @if [ -f /usr/include/iconv.h ]; then \ ${REINPLACE_CMD} -e 's!^[[:space:]]*const char .ip = (const char .) .bp!char *ip = *bp!' \ @@ -116,4 +122,4 @@ do-install: post-install: ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -exec ${SH} -c '${STRIP_CMD} {} > /dev/null 2>&1' \; -.include +.include diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c index f050420f5e21..004f6a5212b9 100644 --- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c +++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c @@ -1,20 +1,25 @@ ---- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig 2021-12-13 19:03:46 UTC -+++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c -@@ -49,6 +49,7 @@ hashalloc(Hash_table_t* ref, ...) +--- programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c.orig 2022-01-20 12:56:31.275926000 -0800 ++++ programs/dtksh/ksh93/src/lib/libast/hash/hashalloc.c 2022-01-20 12:59:47.461533000 -0800 +@@ -49,6 +49,9 @@ va_list* vp = va; Hash_region_f region = 0; void* handle; ++#ifdef POWERPC64LE + va_listarg tmpval; ++#endif va_start(ap, ref); -@@ -151,7 +152,8 @@ hashalloc(Hash_table_t* ref, ...) +@@ -151,7 +154,12 @@ va_copy(*vp, ap); vp++; } -- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#ifdef POWERPC64LE + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); ++#else + va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#endif break; case 0: if (vp > va) diff --git a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c index 5dcf7b11dafe..ae486604c41e 100644 --- a/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c +++ b/x11/cde/files/patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c @@ -1,20 +1,25 @@ ---- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig 2021-12-13 22:46:02 UTC -+++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c -@@ -188,6 +188,7 @@ tokscan(register char* s, char** nxt, const char* fmt, +--- programs/dtksh/ksh93/src/lib/libast/string/tokscan.c.orig 2022-01-20 12:56:38.679529000 -0800 ++++ programs/dtksh/ksh93/src/lib/libast/string/tokscan.c 2022-01-20 13:02:26.179022000 -0800 +@@ -188,6 +188,9 @@ char** p_string; char* prv_f = 0; va_list prv_ap; ++#ifdef POWERPC64LE + va_listarg tmpval; ++#endif va_start(ap, fmt); if (!*s || *s == '\n') -@@ -233,7 +234,8 @@ tokscan(register char* s, char** nxt, const char* fmt, +@@ -233,7 +236,12 @@ prv_f = f; f = va_arg(ap, char*); va_copy(prv_ap, ap); -- va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#ifdef POWERPC64LE + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); ++#else + va_copy(ap, va_listval(va_arg(ap, va_listarg))); ++#endif continue; case 'c': p_char = va_arg(ap, char*);