Page MenuHomeFreeBSD
Differential D35712

print/freetype2: Handle WITH_DEBUG plist changes
ClosedPublic
Actions

Authored by jrm on Jul 4 2022, 7:35 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, May 31, 8:51 AM
Unknown Object (File)
Thu, May 23, 1:30 AM
Unknown Object (File)
Sun, May 19, 3:43 PM
Unknown Object (File)
May 15 2024, 10:59 PM
Unknown Object (File)
May 15 2024, 10:59 PM
Unknown Object (File)
May 15 2024, 9:48 PM
Unknown Object (File)
May 15 2024, 7:55 PM
Unknown Object (File)
May 15 2024, 7:55 PM
View All 90 Files
Subscribers
mat
tcberner

Details

Reviewers
saper_saper.info
tcberner
Group Reviewers
desktop
Commits
R11:79e033e52533: print/freetype2: Do not add debug suffix to shared libraries
R11:a6e35a18d070: print/freetype2: Handle WITH_DEBUG plist changes
Summary

PR: 264457

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 46296
Build 43185: arc lint + arc unit

Event Timeline

jrm created this revision.Jul 4 2022, 7:35 PM
Herald added a subscriber: mat. · View Herald TranscriptJul 4 2022, 7:35 PM
jrm requested review of this revision.Jul 4 2022, 7:35 PM
Harbormaster completed remote builds in B46260: Diff 107762.Jul 4 2022, 7:35 PM
tcberner requested changes to this revision.Jul 5 2022, 5:12 AM
tcberner added a subscriber: tcberner.

Probably nicer:

Makefile:

PLIST_SUB=DEBUG_SUFFIX=${WITH_DEBUG:Dd}

plist:

lib/libfreetype%%DEBUG_SUFFIX%%.so
lib/libfreetype%%DEBUG_SUFFIX%%.so.6
lib/libfreetype%%DEBUG_SUFFIX%%.so.6.18.3
This revision now requires changes to proceed.Jul 5 2022, 5:12 AM
jrm added a comment.EditedJul 6 2022, 6:48 PM
In D35712#810074, @tcberner wrote:

Probably nicer:

Makefile:

PLIST_SUB=DEBUG_SUFFIX=${WITH_DEBUG:Dd}

plist:

lib/libfreetype%%DEBUG_SUFFIX%%.so
lib/libfreetype%%DEBUG_SUFFIX%%.so.6
lib/libfreetype%%DEBUG_SUFFIX%%.so.6.18.3

Agreed. We need += though.

jrm updated this revision to Diff 107856.Jul 6 2022, 6:49 PM

Use PLIST_SUB to handle suffix added to shared library names when WITH_DEBUG is set.

Harbormaster completed remote builds in B46296: Diff 107856.Jul 6 2022, 6:49 PM
jrm updated this revision to Diff 107857.Jul 6 2022, 6:56 PM

Place PLIST_SUB in correct location

Harbormaster completed remote builds in B46297: Diff 107857.Jul 6 2022, 6:57 PM
tcberner accepted this revision.Jul 6 2022, 7:56 PM

lgtm

This revision is now accepted and ready to land.Jul 6 2022, 7:56 PM
Closed by commit R11:a6e35a18d070: print/freetype2: Handle WITH_DEBUG plist changes (authored by jrm). · Explain WhyJul 6 2022, 8:04 PM
This revision was automatically updated to reflect the committed changes.
jrm added a commit: R11:a6e35a18d070: print/freetype2: Handle WITH_DEBUG plist changes.
saper_saper.info reopened this revision.Jul 8 2022, 10:19 PM

Late to the party, but I am not sure this is the right way(tm).

I tend to replace installed libraries with their WITH_DEBUG=yes version to keep them working but to provide debug symbols.

Will apps be able to find libfreetype*.so after it is reinstalled WITH_DEBUG=yes? Maybe we should fix patching the upstream code to drop the "d" suffix altogether instead?

jrm updated this revision to Diff 108163.Jul 14 2022, 2:09 PM

print/freetype2: Do not add debug suffix to shared libraries

Harbormaster completed remote builds in B46431: Diff 108163.Jul 14 2022, 2:09 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jul 18 2022, 5:54 PM
Closed by commit R11:79e033e52533: print/freetype2: Do not add debug suffix to shared libraries (authored by jrm). · Explain Why
This revision was automatically updated to reflect the committed changes.
jrm added a commit: R11:79e033e52533: print/freetype2: Do not add debug suffix to shared libraries.

Revision Contents
Changeset List

PathSize
print/
freetype2/
2 lines
6 lines

Diff 107856

View Options

print/freetype2/Makefile

Loading...
View Options

print/freetype2/pkg-plist

Loading...