PERFORCE change 103370 for review

Gabor Kovesdan gabor at FreeBSD.org
Mon Aug 7 08:31:45 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=103370

Change 103370 by gabor at gabor_spitfire on 2006/08/07 08:28:35

	This change is to fix LDCONFIG_UNEXEC_CMD for DESTDIR.  When deinstalling,
	pkg_delete runs already chrooted, so chrooting the unexec ldconfig
	call was wrong.

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#74 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#74 (text+ko) ====

@@ -1392,21 +1392,22 @@
 .if defined(USE_LINUX_PREFIX)
 .if !defined(DESTDIR)
 LDCONFIG_CMD?=			${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
 LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
 .endif
-LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
 .if !defined(DESTDIR)
 LDCONFIG_CMD?=			${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG} -m ${LDCONFIG_PLIST}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
 .else
 LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST}
 LDCONFIG_PLIST_EXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST}
-LDCONFIG_PLIST_UNEXEC_CMD?=	${CHROOT} ${DESTDIR} ${LDCONFIG} -R
 .endif
+LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG} -R
 .endif
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg


More information about the p4-projects mailing list