Date: Mon, 28 Jul 2014 12:11:48 -0600
From: John Hein <john.hein@microsemi.com>
To: Antoine Brodin <antoine@FreeBSD.org>
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org
Subject: @cwd ${LOCALBASE} for ldconfig files breaks prefix - Re: svn commit: r357076 - head/Mk
Message-ID: <21462.37476.571859.625026@gromit.timing.com>
In-Reply-To: <201406082125.s58LPt1q050276@svn.freebsd.org>
References: <201406082125.s58LPt1q050276@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Antoine Brodin wrote at 21:25 +0000 on Jun 8, 2014: > Author: antoine > Date: Sun Jun 8 21:25:54 2014 > New Revision: 357076 > URL: http://svnweb.freebsd.org/changeset/ports/357076 > QAT: https://qat.redports.org/buildarchive/r357076/ > > Log: > Kill NO_LDCONFIG_MTREE, it is long dead > Make USE_LDCONFIG work when PREFIX!=LOCALBASE, > LDCONFIG_DIR and LDCONFIG_32DIR are expected in LOCALBASE > > Phabric: D195 > Reviewed by: bapt > With hat: portmgr > > Modified: > head/Mk/bsd.port.mk > > Modified: head/Mk/bsd.port.mk > ============================================================================== > --- head/Mk/bsd.port.mk Sun Jun 8 21:22:25 2014 (r357075) > +++ head/Mk/bsd.port.mk Sun Jun 8 21:25:54 2014 (r357076) > @@ -970,12 +970,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org > # - Same as USE_LDCONFIG but the target file is > # ${PREFIX}/libdata/ldconfig32/${UNIQUENAME} instead. > # Note: that should only be used on 64-bit architectures. > -# NO_LDCONFIG_MTREE > -# - Denotes whether the libdata/ldconfig directory is part of > -# the mtree on a given OSVERSION system. If it is not, we > -# create the directory, pull in the ldconfig_compat port, > -# and clean up on de-installation. NOTE: this variable is > -# internal to bsd.port.mk and must not be set in your Makefile. > # > # DOCSDIR - Name of the directory to install the packages docs in. > # Default: ${PREFIX}/share/doc/${PORTNAME} > @@ -4022,18 +4016,15 @@ install-ldconfig-file: > -${LDCONFIG} -m ${USE_LDCONFIG} > .endif > .endif > -.if ${USE_LDCONFIG} != "${PREFIX}/lib" && !defined(INSTALL_AS_USER) > +.if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) > @${ECHO_MSG} "===> Installing ldconfig configuration file" > -.if defined(NO_LDCONFIG_MTREE) > - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR} > +.if defined(NO_MTREE) > + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR} > .endif > @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ > - > ${STAGEDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} > - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} > + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${UNIQUENAME} > + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} > @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} > -.if defined(NO_LDCONFIG_MTREE) > - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1 || true" >> ${TMPPLIST} > -.endif > .endif > .endif > .endif > @@ -4049,16 +4040,13 @@ install-ldconfig-file: > .endif > .if !defined(INSTALL_AS_USER) > @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" > -.if defined(NO_LDCONFIG_MTREE) > - @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_32DIR} > +.if defined(NO_MTREE) > + @${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_32DIR} > .endif > @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ > - > ${STAGEDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} > - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} > + > ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${UNIQUENAME} > + @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST} > @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} > -.if defined(NO_LDCONFIG_MTREE) > - @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} > -.endif > .endif > .endif > .if defined(INSTALLS_SHLIB) This (@cwd ${LOCALBASE}) breaks PREFIX for things in the plist after ldconfig entries (e.g., info entries). There should perhaps be an @cwd to return to previous prefix after the addition of the ldconfig entries? For example: https://redports.org//~jhein/20140728060045-61045-227980/tex-kpathsea-6.1.0_2.log
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21462.37476.571859.625026>