Re: CVS commit: pkgsrc/mk

[Eric Gillespie <epg%pretzelnet.org@localhost>]

Eric Gillespie <epg%pretzelnet.org@localhost> writes:

> Tobias Nygren writes:
> > Log Message:
> > Commit a workaround for the "make replace fails as non-root" bug:
> > Make sure _PKGSRC_BARRIER is set when using just-in-time su.
> > I've been running this for a long time in my tree without ill effects.
> > For more information see PR pkg/34470 and PR pkg/38505.
> 
> This seems to have broken pkgsrc on Linux, or at least Ubuntu
> Dapper and Hardy.  Specifically, pkgsrc Makefiles with targets
> that directly run tools such as libtool and pax (or ${LIBTOOL}
> and ${PAX}, for that matter) don't work.

Also, the comment above _ROOT_CMD on line 636 of bsd.pkg.mk
appears to be correct:

# XXX: Shouldn't the $${PATH} be ${PATH} here? This may be related to
# PR 34470.

--- bsd.pkg.mk.~1.1950.~        2008-08-09 21:20:13.000000000 -0700
+++ bsd.pkg.mk  2008-08-17 17:30:00.000000000 -0700
@@ -637,8 +637,8 @@
 # PR 34470.
 _ROOT_CMD=     cd ${.CURDIR} &&                                        \
                ${SETENV} ${PKGSRC_MAKE_ENV}                            \
-                       PATH="$${PATH}:"${SU_CMD_PATH_APPEND:Q}         \
-               ${MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes                \
+                       PATH="${PATH}:"${SU_CMD_PATH_APPEND:Q}          \
+               ${MAKE} ${MAKEFLAGS}            \
                        PKG_DEBUG_LEVEL=${PKG_DEBUG_LEVEL:Q}            \
                        su-${.TARGET} ${MAKEFLAGS.su-${.TARGET}}
 

Without changing ${PATH}, packages like x11-links (which says
'pax' rather than ${PAX}) still break even after dropping the
_PKGSRC_BARRIER setting.  That line hasn't changed since
26-Jul-06, yet I'm positive I was successfully building x11-links
on Dapper after then.

-- 
Eric Gillespie <*> epg%pretzelnet.org@localhost