From de3c1d2f532d125fd8ff488c5d40e0671b1379a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 2 Oct 2019 11:42:07 +0100 Subject: [PATCH] build: drop the getopt-posix gnulib module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The getopt-posix module fixes a problem with optind being incorrectly set after a failed option parse. It was also previously used to allow the bhyve driver to access a private internal reentrant getopt impl. None of this matters to libvirt code any more. This partially reverts commit b436a8ae5ccb04f8cf893d882d52ab5efc713307 Author: Fabian Freyer Date: Thu Jun 9 00:50:35 2016 +0000 gnulib: add getopt module Reviewed-by: Ján Tomko Signed-off-by: Daniel P. Berrangé --- bootstrap.conf | 1 - m4/virt-driver-bhyve.m4 | 3 --- po/POTFILES | 1 - 3 files changed, 5 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 4f944a9c23..22f6153f3c 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -51,7 +51,6 @@ fsync getaddrinfo getcwd-lgpl gethostname -getopt-posix getpass getpeername getsockname diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4 index f89a5f841a..14b30c0b3e 100644 --- a/m4/virt-driver-bhyve.m4 +++ b/m4/virt-driver-bhyve.m4 @@ -51,9 +51,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[ AM_CONDITIONAL([WITH_BHYVE], [test "$with_bhyve" = "yes"]) ]) -dnl Build with gnulib's getopt which contains a reentrant interface -AC_DEFUN([gl_REPLACE_GETOPT_ALWAYS], []) - AC_DEFUN([LIBVIRT_DRIVER_RESULT_BHYVE],[ LIBVIRT_RESULT([Bhyve], [$with_bhyve]) ]) diff --git a/po/POTFILES b/po/POTFILES index 35fc26c4b9..9385fc4e15 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,5 +1,4 @@ gnulib/lib/gai_strerror.c -gnulib/lib/getopt.c gnulib/lib/regcomp.c src/access/viraccessdriverpolkit.c src/access/viraccessmanager.c