Re: Patches for Fedora 42 & 43
"Andrew L. Moore" <[email protected]> Mon, 13 Oct 2025 01:21:31 -0400
| Newsgroups | gmane.comp.gnu.global.bugs |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format. --------------Sqa12jcT2iwsfucMwWGhpJA9 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit The patch use-system-gnulib.diff depends upon an m4 macro which was omitted. Please find attached a patch for it below. On 10/13/25 01:07, Andrew L. Moore wrote: > Please find attached patches that allow building GNU Global v6.6.14 on > Fedora GNU/Linux v42 and v43. The first three are straight forward: > > 1. When looking for Universal Ctags, use option `--extras'. The code > does this, but configure was using `--extra'. > > 2. When looking for libsqlite3, add /usr/lib64 to the search path. > > 3. Address a GNU C v15 compilation error: assignment from incompatible > pointer type 'int (*)(void)'. The fix is to conditionally add > prototypes to dberr masks. > > Many modern systems come with Gnulib. So either GNU Global could link > against the system Gnulib, or, alternatively, the Gnulib `bootstrap' > script could be added to the GNU Global distribution. Gnulib bootstrap > downloads Gnulib modules as needed. See: > > https://cgit.git.savannah.gnu.org/cgit/gnulib.git/tree/top/bootstrap > > One complication is that the function hash_string is no longer > included in Gnulib. > > 4. So the final patch is an attempt to address these issues in > minimalist (lazy) way: If the system provides regcomp and > getopt_long, then the system-provided functions are used by > default. To override this, use the configure option > `--with-included-regex'. An updated version of the hash_string > function by Bruno Haible is added directly to libutil/strhash.c. > The function is described in the article: > > https://www.haible.de/bruno/hashfunc.html > > A more correct approach might be to leverage Gnulib's bootstrap script > and update strhash.c to use current Gnulib hash functions. If I had > more time, I would have liked to offer an alternative patch for this. > The current Gnulib does have lots of overhead, so maybe the included > patch will be acceptable compromise. --------------Sqa12jcT2iwsfucMwWGhpJA9 Content-Type: application/x-m4; name="ax_func_getopt_long.m4" Content-Disposition: attachment; filename="ax_func_getopt_long.m4" Content-Transfer-Encoding: base64 LS0tIG00L2F4X2Z1bmNfZ2V0b3B0X2xvbmcubTR+CTIwMjUtMTAtMTIgMjI6MzE6MzkuNzA5 NjE5NDgyIC0wNDAwCisrKyBtNC9heF9mdW5jX2dldG9wdF9sb25nLm00CTIwMjUtMTAtMTIg MjI6Mzg6NDQuMjcwNDIzOTExIC0wNDAwCkBAIC0wLDAgKzEsNjYgQEAKKyMgPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09CisjICAgaHR0cHM6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9hdXRvY29u Zi1hcmNoaXZlL2F4X2Z1bmNfZ2V0b3B0X2xvbmcuaHRtbAorIyA9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KKyMKKyMgU1lOT1BTSVMKKyMKKyMgICBBWF9GVU5DX0dFVE9QVF9MT05HCisjCisj IERFU0NSSVBUSU9OCisjCisjICAgQ2hlY2sgZm9yIGdldG9wdF9sb25nIHN1cHBvcnQuCisj CisjICAgVGhpcyBhc3N1bWUgdGhhdCB0aGUgc3RhbmRhcmQgZ2V0b3B0LmggZmlsZSAoZnJv bSBHTlUgbGliYykgaXMgYXZhaWxhYmxlCisjICAgYXMgbGliL2dudWdldG9wdC5oLiBJZiBu ZWVkZWQsIHRoaXMgZmlsZSB3aWxsIGJlIGxpbmtlZCBhcyBnZXRvcHQuaCwgYnV0CisjICAg d2Ugd2FudCB0byBkZWZhdWx0IHRvIHRoZSBzeXN0ZW0ncyBnZXRvcHQuaCBmaWxlLiAoU2Vl CisjICAgaHR0cDovL3NvdXJjZXMucmVkaGF0LmNvbS9tbC9hdXRvbWFrZS8yMDAwLTA5L21z ZzAwMDQxLmh0bWwgZm9yIGFuCisjICAgZXhwbGFuYXRpb24gYWJvdXQgd2h5IHVzaW5nIHRo ZSBzeXN0ZW0ncyBnZXRvcHQuaCBmaWxlIGlzIGltcG9ydGFudC4pCisjCisjIExJQ0VOU0UK KyMKKyMgICBDb3B5cmlnaHQgKGMpIDIwMDggQWxleGFuZHJlIER1cmV0LUx1dHogPGFkbEBn bnUub3JnPgorIworIyAgIFRoaXMgcHJvZ3JhbSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5IGl0CisjICAgdW5kZXIgdGhlIHRlcm1z IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhl CisjICAgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyIG9mIHRo ZSBMaWNlbnNlLCBvciAoYXQgeW91cgorIyAgIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24u CisjCisjICAgVGhpcyBwcm9ncmFtIGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQg aXQgd2lsbCBiZSB1c2VmdWwsIGJ1dAorIyAgIFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRo b3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKyMgICBNRVJDSEFOVEFCSUxJVFkg b3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuIFNlZSB0aGUgR05VIEdlbmVy YWwKKyMgICBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorIworIyAgIFlvdSBz aG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlIGFsb25nCisjICAgd2l0aCB0aGlzIHByb2dyYW0uIElmIG5vdCwgc2VlIDxodHRw czovL3d3dy5nbnUub3JnL2xpY2Vuc2VzLz4uCisjCisjICAgQXMgYSBzcGVjaWFsIGV4Y2Vw dGlvbiwgdGhlIHJlc3BlY3RpdmUgQXV0b2NvbmYgTWFjcm8ncyBjb3B5cmlnaHQgb3duZXIK KyMgICBnaXZlcyB1bmxpbWl0ZWQgcGVybWlzc2lvbiB0byBjb3B5LCBkaXN0cmlidXRlIGFu ZCBtb2RpZnkgdGhlIGNvbmZpZ3VyZQorIyAgIHNjcmlwdHMgdGhhdCBhcmUgdGhlIG91dHB1 dCBvZiBBdXRvY29uZiB3aGVuIHByb2Nlc3NpbmcgdGhlIE1hY3JvLiBZb3UKKyMgICBuZWVk IG5vdCBmb2xsb3cgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z ZSB3aGVuIHVzaW5nCisjICAgb3IgZGlzdHJpYnV0aW5nIHN1Y2ggc2NyaXB0cywgZXZlbiB0 aG91Z2ggcG9ydGlvbnMgb2YgdGhlIHRleHQgb2YgdGhlCisjICAgTWFjcm8gYXBwZWFyIGlu IHRoZW0uIFRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSAoR1BMKSBkb2VzIGdvdmVy bgorIyAgIGFsbCBvdGhlciB1c2Ugb2YgdGhlIG1hdGVyaWFsIHRoYXQgY29uc3RpdHV0ZXMg dGhlIEF1dG9jb25mIE1hY3JvLgorIworIyAgIFRoaXMgc3BlY2lhbCBleGNlcHRpb24gdG8g dGhlIEdQTCBhcHBsaWVzIHRvIHZlcnNpb25zIG9mIHRoZSBBdXRvY29uZgorIyAgIE1hY3Jv IHJlbGVhc2VkIGJ5IHRoZSBBdXRvY29uZiBBcmNoaXZlLiBXaGVuIHlvdSBtYWtlIGFuZCBk aXN0cmlidXRlIGEKKyMgICBtb2RpZmllZCB2ZXJzaW9uIG9mIHRoZSBBdXRvY29uZiBNYWNy bywgeW91IG1heSBleHRlbmQgdGhpcyBzcGVjaWFsCisjICAgZXhjZXB0aW9uIHRvIHRoZSBH UEwgdG8gYXBwbHkgdG8geW91ciBtb2RpZmllZCB2ZXJzaW9uIGFzIHdlbGwuCisKKyNzZXJp YWwgNgorCitBVV9BTElBUyhbQURMX0ZVTkNfR0VUT1BUX0xPTkddLCBbQVhfRlVOQ19HRVRP UFRfTE9OR10pCitBQ19ERUZVTihbQVhfRlVOQ19HRVRPUFRfTE9OR10sCisgW0FDX1BSRVJF USgyLjQ5KWRubAorICAjIGNsZWFuIG91dCBqdW5rIHBvc3NpYmx5IGxlZnQgYmVoaW5kIGJ5 IGEgcHJldmlvdXMgY29uZmlndXJhdGlvbgorICBybSAtZiBsaWIvZ2V0b3B0LmgKKyAgIyBD aGVjayBmb3IgZ2V0b3B0X2xvbmcgc3VwcG9ydAorICBBQ19DSEVDS19IRUFERVJTKFtnZXRv cHQuaF0pCisgIEFDX0NIRUNLX0ZVTkNTKFtnZXRvcHRfbG9uZ10sLAorICAgWyMgRnJlZUJT RCBoYXMgYSBnbnVnZXRvcHQgbGlicmFyeSBmb3IgdGhpcworICAgIEFDX0NIRUNLX0xJQihb Z251Z2V0b3B0XSxbZ2V0b3B0X2xvbmddLAorICAgICBbQUNfREVGSU5FKFtIQVZFX0dFVE9Q VF9MT05HXSwgWzFdLCBbRGVmaW5lIHRvIDEgd2hlbiBnZXRvcHRfbG9uZyBpcyBhdmFpbGFi bGUuXSldLAorICAgICBbIyB1c2UgdGhlIEdOVSByZXBsYWNlbWVudAorICAgICAgQUNfTElC T0JKKGdldG9wdCkKKyAgICAgIEFDX0xJQk9CSihnZXRvcHQxKQorICAgICAgI0FDX0NPTkZJ R19MSU5LUyhbbGliL2dldG9wdC5oOmxpYi9nZXRvcHQuaW4uaF0pCisgICAgICBdKV0pXSkK --------------Sqa12jcT2iwsfucMwWGhpJA9--