From nobody Mon Feb 14 11:41:21 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 8CC6219B703E; Mon, 14 Feb 2022 11:41:21 +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 4Jy2Nx3cRqz4p46; Mon, 14 Feb 2022 11:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644838881; 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=dPOPLHwqwqeLrRYOhRcZHXWjidj6vOdiq5O48NRaTWA=; b=tY3ennHEpsCiI02X6MseqE5txnMXmY/6u8FGNK1O64g0GM+AFiyg0eihUjwA3nAJq3RAU+ bEgb5bQzOanUW448szI0e2Abldoo4P3pebc7syu3Ddd0NvA0HVV/SsrZeG9FoqnBs/bwgP kmbPTfwQJrvaFCZFx1V9VV28bH8U9eN8qEk+g2QieCK8PbOYqkwxDJ1lGS/y/Ap4T6n1ri igP5MjHcT/+CKjOE+jwFYocY+R5Ts4HWEYoA3ZoREGiAvuejXFjL4QuQyOrzMtNKlTqbFa IUPHNrzVQM/RpaDbqrAMTolWJHopgCJ1OkUivPYUaQToEwAVB7AekZXCwLudIQ== 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 516FA62E6; Mon, 14 Feb 2022 11:41:21 +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 21EBfLBM090771; Mon, 14 Feb 2022 11:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EBfLVh090770; Mon, 14 Feb 2022 11:41:21 GMT (envelope-from git) Date: Mon, 14 Feb 2022 11:41:21 GMT Message-Id: <202202141141.21EBfLVh090770@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 98b88b839df1 - main - x11/cde: actually fix build on powerpc64le 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98b88b839df1a88f538b8bfdc74e9734b0df7ea3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644838881; 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=dPOPLHwqwqeLrRYOhRcZHXWjidj6vOdiq5O48NRaTWA=; b=Iw1qhasbpLkw6wE5mGnGWx+AONswb5Mso0yMMhoLuobBSoCihHmiyBhQD+MQ93Oka/Lbbc H5iT1RK/8qTBXNOs9wnsN2qEAWE9vIvw25RQkRzjT3h5Qu2VQz/JueVQqp9hiWxEOCJm6T BpA+2YEoH6PjMcCSW7O05gckc+L8/ZVc/kn5UGXpVBcCjnReHCa0kfjGzgbHeOMillKRFU X77tjXN45RU/JNayZ7+8yC5Lax7o/MOlq+yfUV/r6xklasxcSEltnHe3+1nXw+upecVKtO FK7u7ojKAY+osdZIR3N7OQBoTLKbJFFP7eIuS2AC05F5dV7L+YT8oFz8SfixHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644838881; a=rsa-sha256; cv=none; b=Cfc5W9A/wzep41gbljmraPChvCwA4sXVjxD/NWT5WVna+xBp/OdX3i56Ei9lC1ezic/Clx /U4onEcE+q99v/1FtSPh819NBokJynFH4v+nOHUlkV9nhULqgN0W99lV5Vuc0bddmWd/Sx EOVW8wQmApUT4KVsW5V+bnhsOfbsfIg4mwinFf5aynQx4zXdZnlk2RzCHkfOLmOpfssd2R ee82ObKhSe/XXqgNjAtM2Kn4bj69b6R/9gVH02yS1Q4OApRo/h8oDJKJuFZwsNZbfXJ7LP k2ZrPzLvSaGKmEhuN2NDZzJpyG5Xj4lzuSDAGkJcFpF3ko8Pxt83r8qmjXGYVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=98b88b839df1a88f538b8bfdc74e9734b0df7ea3 commit 98b88b839df1a88f538b8bfdc74e9734b0df7ea3 Author: Piotr Kubaj AuthorDate: 2022-02-14 11:38:50 +0000 Commit: Piotr Kubaj CommitDate: 2022-02-14 11:38:50 +0000 x11/cde: actually fix build on powerpc64le This port doesn't respect setting FLAGS via Makefile, so -DPOWERPC64LE goes unnoticed. Switch to ifdef __powerpc64__. --- x11/cde/Makefile | 8 +------- .../patch-programs_dtksh_ksh93_src_lib_libast_hash_hashalloc.c | 4 ++-- .../patch-programs_dtksh_ksh93_src_lib_libast_string_tokscan.c | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/x11/cde/Makefile b/x11/cde/Makefile index afc2a5219849..c7c9b65ba024 100644 --- a/x11/cde/Makefile +++ b/x11/cde/Makefile @@ -41,12 +41,6 @@ MAKE_ENV= MALLOC_CONF=junk:false 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!' \ @@ -125,4 +119,4 @@ post-install: # Only a problem on armv7 so far ${FIND} ${STAGEDIR}/${PREFIX}/dt -type f -name 'ecp.*' -delete -.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 004f6a5212b9..e729a3b2dcf2 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 @@ -4,7 +4,7 @@ va_list* vp = va; Hash_region_f region = 0; void* handle; -+#ifdef POWERPC64LE ++#ifdef __powerpc64__ + va_listarg tmpval; +#endif @@ -14,7 +14,7 @@ va_copy(*vp, ap); vp++; } -+#ifdef POWERPC64LE ++#ifdef __powerpc64__ + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); +#else 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 ae486604c41e..8e6ada6ebe27 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 @@ -4,7 +4,7 @@ char** p_string; char* prv_f = 0; va_list prv_ap; -+#ifdef POWERPC64LE ++#ifdef __powerpc64__ + va_listarg tmpval; +#endif @@ -14,7 +14,7 @@ prv_f = f; f = va_arg(ap, char*); va_copy(prv_ap, ap); -+#ifdef POWERPC64LE ++#ifdef __powerpc64__ + tmpval = va_listval(va_arg(ap, va_listarg)); + va_copy(ap, tmpval); +#else