Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build on FreeBSD 12 #22

Merged
merged 1 commit into from Nov 27, 2018
Merged

Fix build on FreeBSD 12 #22

merged 1 commit into from Nov 27, 2018

Conversation

mhalden
Copy link
Contributor

@mhalden mhalden commented Nov 27, 2018

Portshaker currently doesn't build on FreeBSD 12, this PR fixes the build on FreeBSD 12.

Issue in FreeBSD bug tracker: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233053

@@ -8,9 +8,8 @@ MAN5= portshaker.conf.5 portshaker.d.5
MAN8= portshaker.8

FILES= merge-updating.awk portshaker.conf.sample portshaker.subr
FILESDIR_merge-updating.awk= ${SHAREDIR}/portshaker
FILESDIR= ${SHAREDIR}/portshaker
FILESDIR_portshaker.conf.sample= ${ETCDIR}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank your for looking into this. I am testing these changes and trying to understand how can FILESDIR_merge-updating.awk / FILESDIR_portshaker.subr cause failure and FILESDIR_portshaker.conf.sample be okay (if that's what I understand).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not FILESDIR_merge-updating.awk / FILESDIR_portshaker.subr that caused the issue, but rather the lack of FILESDIR. I just chose to remove them since they weren't needed when FILESDIR was defined to the same directory.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, it's what I understood. Looks like you need to set FILESDIR and it used to work without setting an explicit value before.

Thanks for digging in the problem and finding the culprit!

@smortex smortex added the enhancement New feature or request label Nov 27, 2018
@smortex smortex self-assigned this Nov 27, 2018
@smortex smortex added this to the v1.0.17 milestone Nov 27, 2018
@smortex smortex merged commit 15767bd into smortex:master Nov 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
2 participants