From nobody Sun Nov 16 07:44:21 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052397; cv=none; d=zohomail.com; s=zohoarc; b=VCUWHBxmVP8pBfxWArqV8KEKS9S26qHZja6fcN5p4b4aPkRv3Zwvrkjxi9IeY4OyEEYgyqzVuZb6yOsVM7gz3Dxxi8IvgXIT6hOnD17iDQi01KpaI3S1IB2BQuLXH/asYc0ENfJ2h4WJ+Nc20nlWRPRM9wtBiMy4SpK7IpFFtak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052397; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8h3AAHc1LO1DpZPMv2lF1h83yhx+jCG7f2kXp2CU/CY=; b=oICs4PO1SJkaVq334R9wMwc1GNc+fMxOpARht8LbTokVBVfrBjmHVfl9iRal4G6BpyFRsyKlEsfdVS1xe3XpQO5E7kFH8J7LD9R0qaum7drG+3ABq28BsAj8Yy+mploYVlTVH/wmPV2r6q/zCZ1ELPeERvvXYMmJFsjLURcGdMs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1599052397689574.361241529186; Wed, 2 Sep 2020 06:13:17 -0700 (PDT) Received: from localhost ([::1]:54868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZg-00082U-Ni for importer@patchew.org; Wed, 02 Sep 2020 09:13:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMs-0006ux-T4 for qemu-devel@nongnu.org; Wed, 02 Sep 2020 09:00:02 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32603 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMn-0007Co-UJ for qemu-devel@nongnu.org; Wed, 02 Sep 2020 09:00:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-450-7KLz2AjvOyiovvuwvczbtA-1; Wed, 02 Sep 2020 08:59:38 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAB21107AD64 for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8E415D9CC for ; Wed, 2 Sep 2020 12:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8h3AAHc1LO1DpZPMv2lF1h83yhx+jCG7f2kXp2CU/CY=; b=BOC0fNh5Mj1pipQtauP6y5D7cAlrVS6sxVSSVvKQlVLUQ2Imj66J+9bY9mC59zBpE7zPoF zkYOTjaInV+3HydcbuhtWlEa3vaCf1XgvV6h7B9BZ6ZjVHoknmIIfzgV2O34YK0FINyo5m 35qHmRefK8E6785s+Pbwk9LE4YgBS3E= X-MC-Unique: 7KLz2AjvOyiovvuwvczbtA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 35/39] configure: do not look for install(1) Date: Wed, 2 Sep 2020 08:59:13 -0400 Message-Id: <20200902125917.26021-36-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:26:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" It is not used anymore, so there is no Solaris-specific check to perform. Signed-off-by: Paolo Bonzini --- configure | 53 ++----------------------------------- docs/devel/build-system.rst | 4 --- meson.build | 1 - 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/configure b/configure index adb5abe0c0..d148242c9a 100755 --- a/configure +++ b/configure @@ -174,36 +174,6 @@ has() { type "$1" >/dev/null 2>&1 } =20 -# search for an executable in PATH -path_of() { - local_command=3D"$1" - local_ifs=3D"$IFS" - local_dir=3D"" - - # pathname has a dir component? - if [ "${local_command#*/}" !=3D "$local_command" ]; then - if [ -x "$local_command" ] && [ ! -d "$local_command" ]; then - echo "$local_command" - return 0 - fi - fi - if [ -z "$local_command" ]; then - return 1 - fi - - IFS=3D: - for local_dir in $PATH; do - if [ -x "$local_dir/$local_command" ] && [ ! -d "$local_dir/$local= _command" ]; then - echo "$local_dir/$local_command" - IFS=3D"${local_ifs:-$(printf ' \t\n')}" - return 0 - fi - done - # not found - IFS=3D"${local_ifs:-$(printf ' \t\n')}" - return 1 -} - version_ge () { local_ver1=3D`echo $1 | tr . ' '` local_ver2=3D`echo $2 | tr . ' '` @@ -893,7 +863,6 @@ Darwin) SunOS) solaris=3D"yes" make=3D"${MAKE-gmake}" - install=3D"${INSTALL-ginstall}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" if test -f /usr/include/sys/soundcard.h ; then audio_drv_list=3D"oss try-sdl" @@ -929,7 +898,7 @@ if [ "$bsd" =3D "yes" ] ; then fi =20 : ${make=3D${MAKE-make}} -: ${install=3D${INSTALL-install}} + # We prefer python 3.x. A bare 'python' is traditionally # python 2.x, but some distros have it as python 3.x, so # we check that too @@ -1016,7 +985,7 @@ for opt do ;; --make=3D*) make=3D"$optarg" ;; - --install=3D*) install=3D"$optarg" + --install=3D*) ;; --python=3D*) python=3D"$optarg" ; explicit_python=3Dyes ;; @@ -1797,7 +1766,6 @@ Advanced options (experts only): --cross-cc-ARCH=3DCC use compiler when building ARCH guest test ca= ses --cross-cc-flags-ARCH=3D use compiler flags when building ARCH guest t= ests --make=3DMAKE use specified make [$make] - --install=3DINSTALL use specified install [$install] --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] --meson=3DMESON use specified meson [$meson] @@ -2315,18 +2283,6 @@ fi # Solaris specific configure tool chain decisions =20 if test "$solaris" =3D "yes" ; then - if has $install; then - : - else - error_exit "Solaris install program not found. Use --install=3D/usr/uc= b/install or" \ - "install fileutils from www.blastwave.org using pkg-get -i fileuti= ls" \ - "to get ginstall which is used by default (which lives in /opt/csw= /bin)" - fi - if test "$(path_of $install)" =3D "/usr/sbin/install" ; then - error_exit "Solaris /usr/sbin/install is not an appropriate install pr= ogram." \ - "try ginstall from the GNU fileutils available from www.blastwave.= org" \ - "using pkg-get -i fileutils, or use --install=3D/usr/ucb/install" - fi if has ar; then : else @@ -7433,11 +7389,6 @@ fi =20 echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak -echo "INSTALL=3D$install" >> $config_host_mak -echo "INSTALL_DIR=3D$install -d -m 0755" >> $config_host_mak -echo "INSTALL_DATA=3D$install -c -m 0644" >> $config_host_mak -echo "INSTALL_PROG=3D$install -c -m 0755" >> $config_host_mak -echo "INSTALL_LIB=3D$install -c -m 0644" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "SPHINX_BUILD=3D$sphinx_build" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 55f0576c07..28492cfcae 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -136,10 +136,6 @@ developers in checking for system features: Determine if $COMMAND exists in the current environment, either as a shell builtin, or executable binary, returning 0 on success. =20 -`path_of $COMMAND` - Return the fully qualified path of $COMMAND, printing it to stdout, - and returning 0 on success. - `check_define $NAME` Determine if the macro $NAME is defined by the system C compiler =20 diff --git a/meson.build b/meson.build index 0452de8d0e..2455eb5e1a 100644 --- a/meson.build +++ b/meson.build @@ -1352,7 +1352,6 @@ summary_info +=3D {'CFLAGS': config_host['= CFLAGS']} summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} summary_info +=3D {'make': config_host['MAKE']} -summary_info +=3D {'install': config_host['INSTALL']} summary_info +=3D {'python': '@0@ (version: @1@)'.format(python= .full_path(), python.language_version())} summary_info +=3D {'sphinx-build': config_host['SPHINX_BUILD']} summary_info +=3D {'genisoimage': config_host['GENISOIMAGE']} --=20 2.26.2