From owner-svn-ports-all@freebsd.org Thu Jan 30 04:07:45 2020 Return-Path: Delivered-To: svn-ports-all@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 AA91322B06D; Thu, 30 Jan 2020 04:07:45 +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 487Rds43fbz4cF5; Thu, 30 Jan 2020 04:07:45 +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 869A91F273; Thu, 30 Jan 2020 04:07:45 +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 00U47jTW037178; Thu, 30 Jan 2020 04:07:45 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00U47jqC037177; Thu, 30 Jan 2020 04:07:45 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202001300407.00U47jqC037177@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Thu, 30 Jan 2020 04:07:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r524625 - branches/2020Q1/devel/elfutils/files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: branches/2020Q1/devel/elfutils/files X-SVN-Commit-Revision: 524625 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2020 04:07:45 -0000 Author: kevans (src committer) Date: Thu Jan 30 04:07:45 2020 New Revision: 524625 URL: https://svnweb.freebsd.org/changeset/ports/524625 Log: MFH: r524564 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) Approved by: koobs (ports), cem (maintainer) Approved by: ports-secteam (implicit; build fix) Modified: branches/2020Q1/devel/elfutils/files/patch-lib_eu-config.h Directory Properties: branches/2020Q1/ (props changed) Modified: branches/2020Q1/devel/elfutils/files/patch-lib_eu-config.h ============================================================================== --- branches/2020Q1/devel/elfutils/files/patch-lib_eu-config.h Thu Jan 30 03:49:12 2020 (r524624) +++ branches/2020Q1/devel/elfutils/files/patch-lib_eu-config.h Thu Jan 30 04:07:45 2020 (r524625) @@ -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