From owner-svn-ports-head@freebsd.org Wed Jan 29 18:35:30 2020 Return-Path: Delivered-To: svn-ports-head@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 914B21F8F7A; Wed, 29 Jan 2020 18:35:30 +0000 (UTC) (envelope-from kevans@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) server-signature RSA-PSS (4096 bits) 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 487BxZ35lRz3R81; Wed, 29 Jan 2020 18:35:30 +0000 (UTC) (envelope-from kevans@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 6161F18684; Wed, 29 Jan 2020 18:35:30 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00TIZU7i089606; Wed, 29 Jan 2020 18:35:30 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00TIZUCP089605; Wed, 29 Jan 2020 18:35:30 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202001291835.00TIZUCP089605@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 29 Jan 2020 18:35:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524564 - head/devel/elfutils/files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/devel/elfutils/files X-SVN-Commit-Revision: 524564 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 18:35:30 -0000 Author: kevans (src committer) Date: Wed Jan 29 18:35:29 2020 New Revision: 524564 URL: https://svnweb.freebsd.org/changeset/ports/524564 Log: devel/elfutils: fix future build failure w.r.t. stdio _unlocked Include early so that the stdio.h function declarations come first, then redefine fputs/fwrite/fread_unlocked to the locked versions. fputc_unlocked will be a macro similar to putc_unlocked, so just hide that one behind an #ifndef since it will be provided as a macro by . The other three will be using the technically-incorrect locked variants until all supported releases provide the needed functions, at which point we can switch them all at once. No PORTREVISION bump as this is just a preemptive build fix that doesn't change the output at all. QA: * portlint not ran, no change outside of a single patch * testport (-CURRENT, amd64; 12.1-RELEASE, amd64; -CURRENT+patch, amd64) PR: 243546 Reviewed by: koobs (ports) Approved by: koobs (ports), cem (maintainer) MFH: 2020Q1 (implicit, build fix) Modified: head/devel/elfutils/files/patch-lib_eu-config.h Modified: head/devel/elfutils/files/patch-lib_eu-config.h ============================================================================== --- head/devel/elfutils/files/patch-lib_eu-config.h Wed Jan 29 18:17:42 2020 (r524563) +++ head/devel/elfutils/files/patch-lib_eu-config.h Wed Jan 29 18:35:29 2020 (r524564) @@ -1,6 +1,6 @@ --- lib/eu-config.h.orig 2015-06-11 11:38:55 UTC +++ lib/eu-config.h -@@ -187,4 +187,171 @@ asm (".section predict_data, \"aw\"; .pr +@@ -187,4 +187,180 @@ asm (".section predict_data, \"aw\"; .pr #endif @@ -10,6 +10,7 @@ +#include +#include +#include ++#include +#include +#include +#include @@ -130,7 +131,15 @@ +#define bswap_32 bswap32 +#define bswap_64 bswap64 + ++/* ++ * Future versions of FreeBSD will provide proper versions of these _unlocked ++ * variants. These can and should be used instead, but won't be available ++ * until FreeBSD 11.4 and 12.2, at which point we should limit the scope of ++ * these to DragonFlyBSD. ++ */ ++#ifndef fputc_unlocked +#define fputc_unlocked putc_unlocked ++#endif +#define fputs_unlocked fputs +#define fwrite_unlocked fwrite +#define fread_unlocked fread