pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/rubygems Fix subtle interaction with DESTDIR duri...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/49fb1646a65f
branches:  trunk
changeset: 539969:49fb1646a65f
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Mar 18 04:01:27 2008 +0000

description:
Fix subtle interaction with DESTDIR during installation -- the Makefiles
generated by mkmf.rb are actually not DESTDIR-safe because the $(DESTDIR)
value gets propagated to the rpath.  Since we already pass --buildroot
to deal with staged installations, explicitly strip out DESTDIR from
the environment.

diffstat:

 misc/rubygems/rubygem.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r b5c9d236858b -r 49fb1646a65f misc/rubygems/rubygem.mk
--- a/misc/rubygems/rubygem.mk  Tue Mar 18 03:50:35 2008 +0000
+++ b/misc/rubygems/rubygem.mk  Tue Mar 18 04:01:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubygem.mk,v 1.23 2008/03/18 03:50:35 jlam Exp $
+# $NetBSD: rubygem.mk,v 1.24 2008/03/18 04:01:27 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install Ruby gems.
@@ -219,7 +219,7 @@
 
 _gem-install-buildroot:
        @${STEP_MSG} "Installing gem into buildroot"
-       ${RUN} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+       ${RUN} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} DESTDIR= \
                ${RUBYGEM} install ${_RUBYGEM_OPTIONS}
 
 .if !empty(GEM_CLEANBUILD)



Home | Main Index | Thread Index | Old Index