From patchwork Mon Apr 20 16:52:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1273564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=e4Nl2k72; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 495Xmg2KQZz9sQx for ; Tue, 21 Apr 2020 02:52:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 216853858D35; Mon, 20 Apr 2020 16:52:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 216853858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1587401537; bh=qR+39qXMrpxPoQaP5nAu+SEP0zqytcVyVBhKPHZ+Gjo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=e4Nl2k72UxtTQsm5oYvCWVNfORGcOsH27OQwIjq/IEhOb+OP2mUrFLuBg8QRN/lIz 5ukPhR21wgtKnPJKnsoKmuWMQRJgd7zTnP4TS4OludF+vmL9lX/PJar/P2R6Qxdneq jx46dOwA6zGnXKHnrGvAvv8tK8m1S8b/s0enCXnc= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by sourceware.org (Postfix) with ESMTPS id 573EA3858D31 for ; Mon, 20 Apr 2020 16:52:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 573EA3858D31 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 495XmX0JCzzQk8j; Mon, 20 Apr 2020 18:52:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id 6VEY9E9x4UJo; Mon, 20 Apr 2020 18:52:08 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] libphobos: Fix option name for --with-libphobos-druntime-only. Date: Mon, 20 Apr 2020 18:52:03 +0200 Message-Id: <20200420165203.6079-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 1B67D1754 X-Rspamd-Score: 1.30 / 15.00 / 15.00 X-Spam-Status: No, score=-27.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch fixes the option --with-libphobos-druntime-only to match the help text, as the prefixing 'libphobos' was intentional. Tested on x86_64-linux-gnu, and committed to mainline. Regards Iain. --- libphobos/ChangeLog: * configure: Regenerate. * configure.ac: Fix option name for --with-libphobos-druntime-only. --- libphobos/configure | 18 +++++++++--------- libphobos/configure.ac | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libphobos/configure b/libphobos/configure index 0d4656ed929..06b5d0047c5 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -842,7 +842,7 @@ with_cross_host enable_version_specific_runtime_libs with_toolexeclibdir enable_libphobos -with_libdruntime_only +with_libphobos_druntime_only enable_libphobos_checking ' ac_precious_vars='build_alias @@ -15237,17 +15237,17 @@ $as_echo "$enable_libphobos" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libphobos-druntime-only" >&5 $as_echo_n "checking for --with-libphobos-druntime-only... " >&6; } -# Check whether --with-libdruntime-only was given. -if test "${with_libdruntime_only+set}" = set; then : - withval=$with_libdruntime_only; +# Check whether --with-libphobos-druntime-only was given. +if test "${with_libphobos_druntime_only+set}" = set; then : + withval=$with_libphobos_druntime_only; else - with_libdruntime_only=auto + with_libphobos_druntime_only=auto fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libdruntime_only" >&5 -$as_echo "$with_libdruntime_only" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libphobos_druntime_only" >&5 +$as_echo "$with_libphobos_druntime_only" >&6; } -case "$with_libdruntime_only" in +case "$with_libphobos_druntime_only" in yes|no|auto) ;; *) as_fn_error $? "Invalid argument for --with-libphobos-druntime-only" "$LINENO" 5 ;; esac @@ -15298,7 +15298,7 @@ fi # Decide if only libdruntime should be built. -case $LIBDRUNTIME_ONLY:$with_libdruntime_only in +case $LIBDRUNTIME_ONLY:$with_libphobos_druntime_only in *:no) only_libdruntime=no ;; *:yes) only_libdruntime=yes ;; yes:*) only_libdruntime=yes ;; diff --git a/libphobos/configure.ac b/libphobos/configure.ac index d82ad8e8c75..805e168881f 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac @@ -152,13 +152,13 @@ AC_ARG_ENABLE(libphobos, AC_MSG_RESULT($enable_libphobos) AC_MSG_CHECKING([for --with-libphobos-druntime-only]) -AC_ARG_WITH(libdruntime-only, +AC_ARG_WITH(libphobos-druntime-only, AS_HELP_STRING([--with-libphobos-druntime-only={yes,no,auto}], [build only the druntime library (default: auto)]),, - [with_libdruntime_only=auto]) -AC_MSG_RESULT($with_libdruntime_only) + [with_libphobos_druntime_only=auto]) +AC_MSG_RESULT($with_libphobos_druntime_only) -case "$with_libdruntime_only" in +case "$with_libphobos_druntime_only" in yes|no|auto) ;; *) AC_MSG_ERROR([Invalid argument for --with-libphobos-druntime-only]) ;; esac @@ -200,7 +200,7 @@ esac AM_CONDITIONAL(ENABLE_LIBPHOBOS, test x$use_libphobos = xyes) # Decide if only libdruntime should be built. -case $LIBDRUNTIME_ONLY:$with_libdruntime_only in +case $LIBDRUNTIME_ONLY:$with_libphobos_druntime_only in *:no) only_libdruntime=no ;; *:yes) only_libdruntime=yes ;; yes:*) only_libdruntime=yes ;;