| Summary: | devel/git: make PCRE2 default and remove OPTION | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Michael Osipov <michael.osipov> | ||||
| Component: | Individual Port(s) | Assignee: | Renato Botelho <garga> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Some People | CC: | michael.osipov | ||||
| Priority: | --- | Keywords: | needs-patch, needs-qa | ||||
| Version: | Latest | Flags: | bugzilla:
maintainer-feedback?
(garga) |
||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Michael Osipov
2022-10-18 20:04:56 UTC
I can provide a patch, if wanted/required. (In reply to Michael Osipov from comment #1) Do not worry. I can take care of it. Thanks! Created attachment 237458 [details]
Patch against /usr/ports (main)
Here is a patch I did today in the morning. Ran with poudriere:
============
=>> Checking shared library dependencies
0x0000000000000001 NEEDED Shared library: [libc.so.7]
0x0000000000000001 NEEDED Shared library: [libcrypto.so.111]
0x0000000000000001 NEEDED Shared library: [libcurl.so.4]
0x0000000000000001 NEEDED Shared library: [libexpat.so.1]
0x0000000000000001 NEEDED Shared library: [libintl.so.8]
0x0000000000000001 NEEDED Shared library: [libpcre2-8.so.0]
0x0000000000000001 NEEDED Shared library: [libssl.so.111]
0x0000000000000001 NEEDED Shared library: [libthr.so.3]
0x0000000000000001 NEEDED Shared library: [libz.so.6]
nobody@123-release-amd64-default-head:/usr/ports/devel/git % ldd /usr/local/bin/git
/usr/local/bin/git:
libpcre2-8.so.0 => /usr/local/lib/libpcre2-8.so.0 (0x80057a000)
libz.so.6 => /lib/libz.so.6 (0x80063b000)
libintl.so.8 => /usr/local/lib/libintl.so.8 (0x800657000)
libthr.so.3 => /lib/libthr.so.3 (0x800666000)
libc.so.7 => /lib/libc.so.7 (0x800693000)
Also all executables in /usr/local/libexec/git-core properly link with pcre2:
git-remote:
libpcre2-8.so.0 => /usr/local/lib/libpcre2-8.so.0 (0x80057a000)
===================
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1 commit 0b7192bd7c4f8e4c05e0a9cefcae347606ebadd1 Author: Michael Osipov <michael.osipov@siemens.com> AuthorDate: 2022-10-19 15:35:10 +0000 Commit: Renato Botelho <garga@FreeBSD.org> CommitDate: 2022-10-19 15:40:09 +0000 devel/git: Make PCRE2 dependency mandatory According to project website, pcre 8.45 was the latest version of old pcre, which is now deprecated, and it must be replaced by pcre2. Remove OPTION and change port to depend of pcre2. PR: 267185 devel/git/Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) Muito obrigado! (In reply to Michael Osipov from comment #5) Actually I reverted this change. As pointed out by jbeich@, it's not necessary. Old PCRE support was removed already, PCRE2 OPTION is present because git can be built without any PCRE support. (In reply to Renato Botelho from comment #6) This is fine as well! |