PERFORCE change 100818 for review

[Gabor Kovesdan]

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

Change 100818 by gabor at gabor_spitfire on 2006/07/06 23:15:51

	USE_LDCONFIG and INSTALL_SHLIB should also work with DESTDIR now.
	This still needs a thorough testing, however and might be refined
	later.

Affected files ...

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

Differences ...

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

@@ -1342,17 +1342,25 @@
 PREFIX?=		${LOCALBASE_REL}
 .endif
 
-### FIXME: ldconfig in DESTDIR
-
 .if defined(USE_LINUX_PREFIX)
-LDCONFIG_CMD?=			${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE}
+.if !defined(DESTDIR)
+LDCONFIG_CMD?=			${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+.else
+LDCONFIG_CMD?=			${CHROOT} ${DESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL}
+.endif
 LDCONFIG_PLIST_EXEC_CMD?=	${LDCONFIG_CMD}
 LDCONFIG_PLIST_UNEXEC_CMD?=	${LDCONFIG_CMD}
 .else
-LDCONFIG_CMD?=				${LDCONFIG} -m ${LDCONFIG_RUNLIST}
+.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
+.endif
 
 PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 
@@ -2891,8 +2899,6 @@
 
 # Put this as far down as possible so it will catch all PLIST_SUB definitions.
 
-### FIXME: ldconfig in DESTDIR
-
 .if defined(INSTALLS_SHLIB)
 LDCONFIG_DIRS?=	%%PREFIX%%/lib
 LDCONFIG_PLIST!=	${ECHO_CMD} ${LDCONFIG_DIRS} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
@@ -3740,10 +3746,18 @@
 .if defined(USE_LDCONFIG)
 .if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Running ldconfig"
+.if !defined(DESTDIR)
 	${LDCONFIG} -m ${USE_LDCONFIG}
 .else
+	${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${USE_LDCONFIG}
+.endif
+.else
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
+.if !defined(DESTDIR)
 	-${LDCONFIG} -m ${USE_LDCONFIG}
+.else
+	${CHROOT} ${DESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG}
+.endif
 .endif
 .if ${USE_LDCONFIG:L} != "${PREFIX}/lib"
 	@${ECHO_MSG} "===>   Installing ldconfig configuration file"
@@ -3761,10 +3775,18 @@
 .if defined(USE_LDCONFIG32)
 .if !defined(INSTALL_AS_USER)
 	@${ECHO_MSG} "===>   Running ldconfig"
+.if !defined(DESTDIR)
 	${LDCONFIG} -32 -m ${USE_LDCONFIG32}
 .else
+	${CHROOT} ${DESTDIR} ${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.endif
+.else
 	@${ECHO_MSG} "===>   Running ldconfig (errors are ignored)"
+.if !defined(DESTDIR)
 	-${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.else
+	${CHROOT} ${DESTDIR} -${LDCONFIG} -32 -m ${USE_LDCONFIG32}
+.endif
 .endif
 	@${ECHO_MSG} "===>   Installing 32-bit ldconfig configuration file"
 .if defined(NO_LDCONFIG_MTREE)