From nobody Sun Mar 03 17:11:48 2024 X-Original-To: freebsd-stable@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 4TnpKC1GqJz5Bw16 for ; Sun, 3 Mar 2024 17:11:59 +0000 (UTC) (envelope-from jo@bruelltuete.com) Received: from email.jo-t.de (seppel.jo-t.de [45.132.244.126]) (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 4TnpKB17FNz4X9X for ; Sun, 3 Mar 2024 17:11:58 +0000 (UTC) (envelope-from jo@bruelltuete.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bruelltuete.com header.s=bruelltuete18a header.b=QD9oOLRH; dmarc=pass (policy=none) header.from=bruelltuete.com; spf=pass (mx1.freebsd.org: domain of jo@bruelltuete.com designates 45.132.244.126 as permitted sender) smtp.mailfrom=jo@bruelltuete.com DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=bruelltuete.com; s=bruelltuete18a; t=1709485910; bh=jv9PjLAvtT8sjRZLWpJBxAmwTUf5AnIwixDbbT8yOBw=; h=Message-ID:Date:MIME-Version:To:From:Subject:From; b=QD9oOLRHjubDRXv29Vn1QOvhRBceGTNOQUx9K0Z3jddqK+qZe96n3GvdeoQdKEMMo Z52oTDTk4V2TdZjgkUZCLx7VLV5O4c6a0FKmGQsO6vHYpp1mSkm8c1y8whwFjZPhry VQYGvNtUdMiqlO6GRmLPX2XJ8s/VCgeSXsv1O2bIb4ufqHpFzYM4cUUCYudn8MrtKn jKXXZ4n7cjtavlVFpwfSyItgpuL18x0tANOq0uKn2S+bYKJbWLB4JOesT3iXMyL2/d Pvr9+jl7BwwprgjQTmtKSPbYnVCnONLHnzcUQCin587YHnqCauGx1eQBaRG9NuUbiz 7PllMF/KFrVig== Message-ID: <9d1a95e5-2972-4e52-88ef-8d7993275f14@bruelltuete.com> Date: Sun, 3 Mar 2024 17:11:48 +0000 List-Id: Production branch of FreeBSD source code List-Archive: https://lists.freebsd.org/archives/freebsd-stable List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-stable@freebsd.org X-BeenThere: freebsd-stable@freebsd.org MIME-Version: 1.0 Content-Language: en-GB To: FreeBSD Stable From: Johannes Totz Subject: Failed compiling releng/13.2, commit missing? Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SUBJECT_ENDS_QUESTION(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; DMARC_POLICY_ALLOW(-0.50)[bruelltuete.com,none]; R_SPF_ALLOW(-0.20)[+mx]; R_DKIM_ALLOW(-0.20)[bruelltuete.com:s=bruelltuete18a]; MIME_GOOD(-0.10)[text/plain]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:197540, ipnet:45.132.244.0/22, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-stable@freebsd.org]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bruelltuete.com:+] X-Rspamd-Queue-Id: 4TnpKB17FNz4X9X Hi everyone, I tried compiling releng/13.2 on a fresh stable/13. That fails with: --- _bootstrap-tools-usr.sbin/zic --- /scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:464:8: error: an attribute list cannot appear here 464 | static ATTRIBUTE_NORETURN void | ^~~~~~~~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: note: expanded from macro 'ATTRIBUTE_NORETURN' 471 | # define ATTRIBUTE_NORETURN [[noreturn]] | ^~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:471:8: error: an attribute list cannot appear here 471 | static ATTRIBUTE_NORETURN void | ^~~~~~~~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: note: expanded from macro 'ATTRIBUTE_NORETURN' 471 | # define ATTRIBUTE_NORETURN [[noreturn]] | ^~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:669:8: error: an attribute list cannot appear here 669 | static ATTRIBUTE_NORETURN void | ^~~~~~~~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: note: expanded from macro 'ATTRIBUTE_NORETURN' 471 | # define ATTRIBUTE_NORETURN [[noreturn]] | ^~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/zic.c:3778:8: error: an attribute list cannot appear here 3778 | static ATTRIBUTE_NORETURN void | ^~~~~~~~~~~~~~~~~~ /scratch/20240303_162512/stage/usr/src/contrib/tzcode/private.h:471:30: note: expanded from macro 'ATTRIBUTE_NORETURN' 471 | # define ATTRIBUTE_NORETURN [[noreturn]] | ^~~~~~~~~~~~ 4 errors generated. *** [zic.o] Error code 1 make[3]: stopped in /scratch/20240303_162512/stage/usr/src/usr.sbin/zic Compiling stable/13 itself is fine. Looking at the history of zic, comparing releng/13.2 and stable/13, https://github.com/freebsd/freebsd-src/commits/releng/13.2/contrib/tzcode/zic.c and https://github.com/freebsd/freebsd-src/commits/stable/13/contrib/tzcode/zic.c, we see that stable/13 has an extra commit "Update tzcode to 2023c." that does change that attribute/keyword order. Releng/13.2 has "import tzdata 2023d" and "...2024a", but no "...2023c". Is that commit simply missing on that branch? cheers, Johannes