Date: Mon, 23 Sep 2013 20:53:12 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r328081 - head/Mk Message-ID: <5240F088.8040504@FreeBSD.org> In-Reply-To: <201309240131.r8O1Vjow012938@svn.freebsd.org> References: <201309240131.r8O1Vjow012938@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --kqxx9dsNnRKdbEjEKU90oGvT5XSrotp0v Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 9/23/2013 8:31 PM, Bryan Drewery wrote: > Author: bdrewery > Date: Tue Sep 24 01:31:44 2013 > New Revision: 328081 > URL: http://svnweb.freebsd.org/changeset/ports/328081 >=20 > Log: > - Be explicit about prefix with @cwd for USE_LDCONFIG > This fixes an issue with staging with pkg_install since it uses pkg= _create > -S which doesn't seem to work properly with "@cwd" resetting to -p >=20 I should have mentioned that this fixes the many portupgrade build failure reports I received. > Modified: > head/Mk/bsd.port.mk >=20 > Modified: head/Mk/bsd.port.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/Mk/bsd.port.mk Tue Sep 24 01:13:35 2013 (r328080) > +++ head/Mk/bsd.port.mk Tue Sep 24 01:31:44 2013 (r328081) > @@ -4054,7 +4054,7 @@ install-ldconfig-file: > .endif > @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} > - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} > + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} > @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} > .if defined(NO_LDCONFIG_MTREE) > @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" = >> ${TMPPLIST} > @@ -4079,7 +4079,7 @@ install-ldconfig-file: > .endif > @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} > - @${ECHO_CMD} "@cwd" >> ${TMPPLIST} > + @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} > @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} > .if defined(NO_LDCONFIG_MTREE) > @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${T= MPPLIST} >=20 --=20 Regards, Bryan Drewery --kqxx9dsNnRKdbEjEKU90oGvT5XSrotp0v Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJSQPCIAAoJEG54KsA8mwz5wd4P/A8+yXUqsRUre5RStMoKVa3g ltMCj7wOQVDX5EKlx0zNi5xS3I6zaOFH+wnD3hq32gPUn+Lh8XOpXdXEOpRctQxB 7G51QoJQbG9aGFoAjT+KmYmlFfC4HywaLaBne0ft2mqWr2f1eiS4BHEXtSh3465V pnkI5pRY9DesJ20JaNDy+4S2X4E0iF7Y/62D0XlkpTb4BI3sLx1DuQNSU2j+tPJP yrNl65LjfMLuvgQKzZhZtP/93oRc2JEFAw2xZpmVgFI7Xugl+ufEDh+CNx51F1iP ARc3969DU3p0Rx8PYm1iAwjFFbMrsHwPbeioLJdnmDmarALTIyq2enTJ19n0gIhJ JsnPfGOHBXn8NiOsgooF+Ko7m/OjKwE3NSAu/f87kE0+M7+pD8QEEtT79zuwcot6 kDgkzANDEPPlv0CPZk6qT3MmnwdoAM7INvFStmGmLQ+YSULVGS2ZdeSRheGvVnhN gZLaxwYSGE8fx3mJA7CGzmlEZ84ea5/Lw76iKz4LbC+dY+shRiuG7Wwi70Ro/s1e JPpks2IJ3EOXseCGho+49NqLLkAUsRWT0VtZgO9DPPCwmiEo8zvoYAHpWT7lBLVn SfLtWnYl2VcDztJj48dsoDyYODwoVOn6MGtgne/dMpZE97B1g/fNLuJMB3pi+Dzo peVxidRf0Slr3fiTYKtU =yol9 -----END PGP SIGNATURE----- --kqxx9dsNnRKdbEjEKU90oGvT5XSrotp0v--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5240F088.8040504>