Don't hardcode /usr/local/plan9 in C source code #532
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
That is, not only when -r was given. This allows using this veriable in mkfiles across the code base.
Allows this function to always return the proper path in situations where the $PLAN9 environment variable is not set, i.e. a rc login shell.
nmeum
force-pushed
the
hardcoded-target-path
branch
2 times, most recently
from
84aaf91
to
8ae7fa2
Compare
algitbot
pushed a commit
to alpinelinux/aports
that referenced
this pull request
Oct 31, 2021
Replace occurrence automatically with find(1), grep(1), and sed(1) in order to ensure that we don't need to check for new hardcoded paths in modified files on upgrade. This is also what other Linux distributions (e.g. Gentoo and Arch Linux) do. See 9fans/plan9port#532 Fixes #26969
algitbot
pushed a commit
to alpinelinux/aports
that referenced
this pull request
Jul 28, 2022
9fans/plan9port#532 has been merged upstream and, as such, it should no longer be necessary to manually fix hardcoded paths in the C source code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I maintain a plan9port package for Alpine Linux. For this package, plan9port is installed to
/usr/lib/plan9not/usr/local/plan9in order to comply with our packaging policy. Doing so is supported by plan9port via thePLAN9_TARGETenvironment variable and the./INSTALL-r flag. The installation script replaces hardcoded references to/usr/local/plan9withPLAN9_TARGETin various files via the./lib/moveplan9.shscript.A few days ago I was made aware that moveplan9.sh does not replace hardcoded references to
/usr/local/plan9in C source code files since it is invoked after the code has been compiled. The following files have been identified to contain such hardcoded paths:src/lib9/get9root.csrc/cmd/sam/sam.csrc/cmd/upas/nfs/imap.cAs such, the affected code in these files does not work correctly if plan9port is installed to
/usr/lib/plan9. For example, get9root does not work if$PLAN9is not set (e.g. in a rc(1) login shell). This pull request fixes get9root by falling back to the configuredPLAN9_TARGETvia a CPP define instead of hardcoding/usr/local/plan9inget9root.c. The remaining two files have been fixed by either using get9root (sam.c) or using thePLAN9_TARGETCPP define as well (imap.c).Would be nice to get this merged in order to ease packaging plan9port for Linux distributions.