From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@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 ; 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: In-Reply-To: From: =?UTF-8?B?5YKF57un5pmX?= Date: Wed, 22 Jan 2020 06:12:00 -0000 Message-ID: Subject: Re: [PATCH] Modify python-config.py or replace it with official one to support python3 To: gdb-patches Cc: Christian Biesinger Content-Type: multipart/mixed; boundary="000000000000c6d885059cb3c4c7" X-SW-Source: 2020-01/txt/msg00667.txt.bz2 --000000000000c6d885059cb3c4c7 Content-Type: text/plain; charset="UTF-8" Content-length: 2042 add warning to explain that if no python-config found,fall back to internal copy "gdb/python/python-config.py" --- 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 else --000000000000c6d885059cb3c4c7 Content-Type: application/octet-stream; name="python-config.patch" Content-Disposition: attachment; filename="python-config.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k5ov1edr0 Content-length: 2619 LS0tIGEvZ2RiL2NvbmZpZ3VyZS5hYworKysgYi9nZGIvY29uZmlndXJlLmFj CkBAIC04MzQsMjkgKzgzNCwzNiBAQCBlbHNlCiAgICAgZXNhYwogICBlc2Fj CiAKKyAgcHl0aG9uX2NvbmZpZz0KICAgaWYgdGVzdCAiJHtweXRob25fcHJv Z30iICE9IG1pc3Npbmc7IHRoZW4KKyAgICBBQ19DSEVDS19GSUxFKFske3B5 dGhvbl9wcm9nfS1jb25maWddLFtweXRob25fY29uZmlnPSIke3B5dGhvbl9w cm9nfS1jb25maWciXSxbcHl0aG9uX2NvbmZpZz0iJHtweXRob25fcHJvZ30g JHtzcmNkaXJ9L3B5dGhvbi9weXRob24tY29uZmlnLnB5IgorQUNfTVNHX1dB Uk4ocHl0aG9uLWNvbmZpZyBub3QgZm91bmQhIEZhbGwgYmFjayB0byBpbnRl cm5hbCBjb3B5LildKQogICAgICMgV2UgaGF2ZSBhIHB5dGhvbiBwcm9ncmFt IHRvIHVzZSwgYnV0IGl0IG1heSBiZSB0b28gb2xkLgogICAgICMgRG9uJ3Qg ZmxhZyBhbiBlcnJvciBmb3IgLS13aXRoLXB5dGhvbj1hdXRvICh0aGUgZGVm YXVsdCkuCiAgICAgaGF2ZV9weXRob25fY29uZmlnPXllcwotICAgIHB5dGhv bl9pbmNsdWRlcz1gJHtweXRob25fcHJvZ30gJHtzcmNkaXJ9L3B5dGhvbi9w eXRob24tY29uZmlnLnB5IC0taW5jbHVkZXNgCisgICAgcHl0aG9uX2luY2x1 ZGVzPWAke3B5dGhvbl9jb25maWd9IC0taW5jbHVkZXNgCiAgICAgaWYgdGVz dCAkPyAhPSAwOyB0aGVuCiAgICAgICBoYXZlX3B5dGhvbl9jb25maWc9ZmFp bGVkCiAgICAgICBpZiB0ZXN0ICIke3dpdGhfcHl0aG9ufSIgIT0gYXV0bzsg dGhlbgotICAgICAgICBBQ19FUlJPUihmYWlsdXJlIHJ1bm5pbmcgcHl0aG9u LWNvbmZpZyAtLWluY2x1ZGVzKQorICAgICAgICBBQ19FUlJPUihmYWlsdXJl IHJ1bm5pbmcgJHtweXRob25fY29uZmlnfSAtLWluY2x1ZGVzKQogICAgICAg ZmkKICAgICBmaQotICAgIHB5dGhvbl9saWJzPWAke3B5dGhvbl9wcm9nfSAk e3NyY2Rpcn0vcHl0aG9uL3B5dGhvbi1jb25maWcucHkgLS1sZGZsYWdzYAor IyBGb3IgcHl0aG9uIDMuOCsgdGhlcmUgbXVzdCBiZSBhICItLWVtYmVkIiBm bGFnIHRvIHNob3cgbGliIHZlcnNpb24uCisgICAgcHl0aG9uX2xpYnM9YCR7 cHl0aG9uX2NvbmZpZ30gLS1sZGZsYWdzIC0tZW1iZWRgCiAgICAgaWYgdGVz dCAkPyAhPSAwOyB0aGVuCi0gICAgICBoYXZlX3B5dGhvbl9jb25maWc9ZmFp bGVkCi0gICAgICBpZiB0ZXN0ICIke3dpdGhfcHl0aG9ufSIgIT0gYXV0bzsg dGhlbgotICAgICAgICBBQ19FUlJPUihmYWlsdXJlIHJ1bm5pbmcgcHl0aG9u LWNvbmZpZyAtLWxkZmxhZ3MpCisgICAgICBweXRob25fbGlicz1gJHtweXRo b25fY29uZmlnfSAtLWxkZmxhZ3NgCisgICAgICBpZiB0ZXN0ICQ/ICE9IDA7 IHRoZW4KKyAgICAgICAgaGF2ZV9weXRob25fY29uZmlnPWZhaWxlZAorICAg ICAgICBpZiB0ZXN0ICIke3dpdGhfcHl0aG9ufSIgIT0gYXV0bzsgdGhlbgor ICAgICAgICAgIEFDX0VSUk9SKGZhaWx1cmUgcnVubmluZyAke3B5dGhvbl9j b25maWd9IC0tbGRmbGFncykKKyAgICAgICAgZmkKICAgICAgIGZpCiAgICAg ZmkKLSAgICBweXRob25fcHJlZml4PWAke3B5dGhvbl9wcm9nfSAke3NyY2Rp cn0vcHl0aG9uL3B5dGhvbi1jb25maWcucHkgLS1leGVjLXByZWZpeGAKKyAg ICBweXRob25fcHJlZml4PWAke3B5dGhvbl9jb25maWd9IC0tZXhlYy1wcmVm aXhgCiAgICAgaWYgdGVzdCAkPyAhPSAwOyB0aGVuCiAgICAgICBoYXZlX3B5 dGhvbl9jb25maWc9ZmFpbGVkCiAgICAgICBpZiB0ZXN0ICIke3dpdGhfcHl0 aG9ufSIgIT0gYXV0bzsgdGhlbgotICAgICAgICBBQ19FUlJPUihmYWlsdXJl IHJ1bm5pbmcgcHl0aG9uLWNvbmZpZyAtLWV4ZWMtcHJlZml4KQorICAgICAg ICBBQ19FUlJPUihmYWlsdXJlIHJ1bm5pbmcgJHtweXRob25fY29uZmlnfSAt LWV4ZWMtcHJlZml4KQogICAgICAgZmkKICAgICBmaQogICBlbHNlCg== --000000000000c6d885059cb3c4c7--