Bug 267073 - sysutils/jdupes: Update to 1.21.0
Summary: sysutils/jdupes: Update to 1.21.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Daniel Engberg
URL: https://github.com/jbruchon/jdupes/re...
Keywords:
Depends on:
Blocks:
 
Reported: 2022-10-15 10:42 UTC by Daniel Engberg
Modified: 2022-10-30 20:58 UTC (History)
1 user (show)

See Also:
tom: maintainer-feedback+


Attachments
Patch for jdupes (2.40 KB, patch)
2022-10-15 10:42 UTC, Daniel Engberg
no flags Details | Diff
Patch for jdupes v2 (3.02 KB, patch)
2022-10-23 21:38 UTC, Daniel Engberg
tom: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Daniel Engberg freebsd_committer freebsd_triage 2022-10-15 10:42:37 UTC
Created attachment 237327 [details]
Patch for jdupes

Unbundle xxHash [1] 
Unset -g during compilation

Poudriere testport OK 12.3-RELEASE (amd64)
Poudriere testport OK 13.1-RELEASE (i386)

1: https://github.com/jbruchon/jdupes/issues/217 ) an
Comment 1 Thomas Hurst 2022-10-23 15:58:50 UTC
Unsetting -g should be conditional on WITH_DEBUG, no?

Is it actually worth doing that instead of relying on the ports system stripping conditionally?
Comment 2 Daniel Engberg freebsd_committer freebsd_triage 2022-10-23 17:43:11 UTC
We need to patch Makefile anyway so might as well remove it?
Comment 3 Thomas Hurst 2022-10-23 20:39:45 UTC
(In reply to Daniel Engberg from comment #2)

Ah, see, CFLAGS gets merged in and will set -g for us, so just stripping it is correct.  I think the -O2 should also be stripped so optimization level isn't set unconditionally.

I'm also seeing an expr error on build from an attempt to detect gcc version.  Looks like that can be stubbed out.
Comment 4 Daniel Engberg freebsd_committer freebsd_triage 2022-10-23 21:38:49 UTC
Created attachment 237569 [details]
Patch for jdupes v2

Strip hardcoded optimization
Remove hardcoded GCC version check
Comment 5 Daniel Engberg freebsd_committer freebsd_triage 2022-10-23 21:39:11 UTC
You're right, all of this should be fixed now
Comment 6 Thomas Hurst 2022-10-23 23:04:17 UTC
Comment on attachment 237569 [details]
Patch for jdupes v2

Thanks Daniel, this looks good.

- Passes poudriere-testport(8) on 13.1/amd64
- CFLAGS and WITH_DEBUG handled appropriately
- No expr errors
- jdupes(1) seems to work when comparing results on multiple trees with fdupes(1)

I think the remaining linker warnings of ignoring attempts to set a new stack limit are harmless, since FreeBSD already has quite generous limits by default, even on 32-bit.
Comment 7 Thomas Hurst 2022-10-23 23:06:22 UTC
Comment on attachment 237569 [details]
Patch for jdupes v2

Could have sworn I set maintainer-approval + there...
Comment 8 commit-hook freebsd_committer freebsd_triage 2022-10-30 20:07:20 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3375d85b5e7f7e4dec59696ed7f37debb0883fef

commit 3375d85b5e7f7e4dec59696ed7f37debb0883fef
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-10-30 19:47:50 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2022-10-30 20:04:23 +0000

    sysutils/jdupes: Update to 1.21.0

    Use xxHash from ports instead of bundled version
    Strip hardcoded optimization and -g
    Remove hardcoded GCC version check

    Changelog: https://github.com/jbruchon/jdupes/releases/tag/v1.21.0

    PR:             267073
    Reviewed by:    Thomas Hurst <tom@hur.st> (maintainer)

 sysutils/jdupes/Makefile                   |  8 +++++--
 sysutils/jdupes/distinfo                   |  6 +++---
 sysutils/jdupes/files/patch-Makefile (new) | 34 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
Comment 9 Daniel Engberg freebsd_committer freebsd_triage 2022-10-30 20:58:43 UTC
Committed, thanks