Makefile.inc1: Fix package-pkg with a non-default LOCALBASE
ClosedPublic
Actions

Authored by ivy on Fri, Sep 19, 11:28 PM.

Details

Reviewers

cperciva
bapt

Commits

rG46a4ee6e6e67: Makefile.inc1: Fix package-pkg with a non-default LOCALBASE
rGf259daa708f5: Makefile.inc1: Fix package-pkg with a non-default LOCALBASE

Summary

package-pkg (via make-pkg-package.sh) passes CONFIGURE_ARGS to make when
building ports-mgmt/pkg, which overrides the port's default configure
args that are supposed to set --prefix. This means that pkg is always
built with the default prefix of /usr/local, which then fails when ports
tries to package it from LOCALBASE.

Work around this by explicitly adding --prefix to CONFIGURE_ARGS.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 67188
Build 64071: arc lint + arc unit

Event Timeline

ivy created this revision.Fri, Sep 19, 11:28 PM

Herald added subscribers: jrtc27, emaste, imp. · View Herald TranscriptFri, Sep 19, 11:28 PM

ivy requested review of this revision.Fri, Sep 19, 11:28 PM

Harbormaster completed remote builds in B67188: Diff 162448.Fri, Sep 19, 11:28 PM

ivy added a child revision: D52635: release: Fail the build if pkg can't be installed.Sat, Sep 20, 2:33 AM

bapt accepted this revision.Tue, Sep 23, 8:40 AM

This revision is now accepted and ready to land.Tue, Sep 23, 8:40 AM

Have you tested that this works if LOCALBASE is not set?

In D52634#1203769, @cperciva wrote:

Have you tested that this works if LOCALBASE is not set?

LOCALBASE is always set in Makefile.inc1, see line 59. but i just checked to be sure, and yes, it works.

In D52634#1203779, @ivy wrote:

In D52634#1203769, @cperciva wrote:

Have you tested that this works if LOCALBASE is not set?

LOCALBASE is always set in Makefile.inc1, see line 59. but i just checked to be sure, and yes, it works.