From patchwork Wed Jan 22 05:26:26 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?b?5YKF57un5pmX?= <fjhhz1997@gmail.com>
X-Patchwork-Id: 37463
Received: (qmail 117957 invoked by alias); 22 Jan 2020 05:26:48 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 117944 invoked by uid 89); 22 Jan 2020 05:26:47 -0000
Authentication-Results: sourceware.org; auth=none
X-Spam-SWARE-Status: No, score=-14.6 required=5.0 tests=AWL, BAYES_00,
	FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_2,
	GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE,
	SPF_PASS autolearn=ham version=3.3.1 spammy=
X-HELO: mail-ed1-f65.google.com
Received: from mail-ed1-f65.google.com (HELO mail-ed1-f65.google.com)
	(209.85.208.65) by sourceware.org
	(qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP;
	Wed, 22 Jan 2020 05:26:40 +0000
Received: by mail-ed1-f65.google.com with SMTP id f8so5498318edv.2 for
	<gdb-patches@sourceware.org>; Tue, 21 Jan 2020 21:26:39 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
	h=mime-version:references:in-reply-to:from:date:message-id:subject:to
	:cc; bh=Ntq0mgXZJF7IvrLgw0RE76IVwLOGlvjVvlhWlfnL2HI=;
	b=VoVHimFCwDnERsu0sj7yNYhuTOV6u9TRN/A2RNFv3qfSs32Yfg+w0IZTrg4pwzvl8E
	Qidolvl3pKzFbUFNoO6OE3q5CEzyxYHBa74aTBB/MPzi1jaU6stnTOzcOkvXpMDx0U8A
	YPCgd4JMVHD2jGoEWBMMcrcbqH6KcZVVfOBLkCzxz57YP16vRKs5HKhW1olt17APT2iC
	umnlx0VdoC/ku7LNzKcOo27se5CBS2GIt1ViE7iMvj8gEhewRI+MeSqbkSAs2iVWYaFa
	lpwHF5nLD/zHa+H06MOUkD4DtDKV7J390ZUQHII7Tz2Pmyqg3aMWkKyaPW4g8uXxYe9P
	RehA==
MIME-Version: 1.0
References: 
 <CAPwS6qN9iHy=4XrXCf8AhEw=NY3G9T2=9-3iHn0iaotXQ4TVQg@mail.gmail.com>
	<CAPwS6qMKW+PzjHQiLM19aDy-8=rFO8aF9WMiRS=nOjK=iJaSzQ@mail.gmail.com>
	<CAPTJ0XEqmm5MuoXacYZ272-x_+TSEv-psAJy1pcz9qu1J8_QZg@mail.gmail.com>
	<CAPwS6qOtjH-g88iy7DmUoMyUO1F7O+vZQWoWNZfzZoVkSJ=qtQ@mail.gmail.com>
	<CAPwS6qMXSq_Od2ZZVFSb7uWsL7pPkODQ0A+JsPPKRaSGGMisAA@mail.gmail.com>
	<CAPwS6qO0bebT3oz-haEEdQ=z8sNheEysbaberg-3xktcGofbvA@mail.gmail.com>
In-Reply-To: 
 <CAPwS6qO0bebT3oz-haEEdQ=z8sNheEysbaberg-3xktcGofbvA@mail.gmail.com>
From: =?UTF-8?B?5YKF57un5pmX?= <fjhhz1997@gmail.com>
Date: Wed, 22 Jan 2020 13:26:26 +0800
Message-ID: 
 <CAPwS6qO1Ty-GhaCA79YQn4qi41+M1XFVTttA9PJwjG=bepvFdQ@mail.gmail.com>
Subject: Re: [PATCH] Modify python-config.py or replace it with official one
	to support python3
To: gdb-patches <gdb-patches@sourceware.org>
Cc: Christian Biesinger <cbiesinger@google.com>

add warning to explain that if no python-config found,fall back to
internal copy "gdb/python/python-config.py"


   else

--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -834,29 +834,36 @@ else
     esac
   esac

+  python_config=
   if test "${python_prog}" != missing; then
+    AC_CHECK_FILE([${python_prog}-config],[python_config="${python_prog}-config"],[python_config="${python_prog}
${srcdir}/python/python-config.py"
+AC_MSG_WARN(python-config not found! Fall back to internal copy.)])
     # We have a python program to use, but it may be too old.
     # Don't flag an error for --with-python=auto (the default).
     have_python_config=yes
-    python_includes=`${python_prog} ${srcdir}/python/python-config.py
--includes`
+    python_includes=`${python_config} --includes`
     if test $? != 0; then
       have_python_config=failed
       if test "${with_python}" != auto; then
-        AC_ERROR(failure running python-config --includes)
+        AC_ERROR(failure running ${python_config} --includes)
       fi
     fi
-    python_libs=`${python_prog} ${srcdir}/python/python-config.py --ldflags`
+# For python 3.8+ there must be a "--embed" flag to show lib version.
+    python_libs=`${python_config} --ldflags --embed`
     if test $? != 0; then
-      have_python_config=failed
-      if test "${with_python}" != auto; then
-        AC_ERROR(failure running python-config --ldflags)
+      python_libs=`${python_config} --ldflags`
+      if test $? != 0; then
+        have_python_config=failed
+        if test "${with_python}" != auto; then
+          AC_ERROR(failure running ${python_config} --ldflags)
+        fi
       fi
     fi
-    python_prefix=`${python_prog} ${srcdir}/python/python-config.py
--exec-prefix`
+    python_prefix=`${python_config} --exec-prefix`
     if test $? != 0; then
       have_python_config=failed
       if test "${with_python}" != auto; then
-        AC_ERROR(failure running python-config --exec-prefix)
+        AC_ERROR(failure running ${python_config} --exec-prefix)
       fi
     fi