Date: Tue, 13 Nov 2012 23:30:10 +1100 From: "Michael Vale" <masked@internode.on.net> To: <freebsd-embedded@freebsd.org>, <freebsd-ports@freebsd.org>, <freebsd-hackers@freebsd.org> Subject: my work on cross-build for mips, arm, etc - your help, please! Message-ID: <F4D7723DE94A4D228EB46C85464420C9@forexamplePC>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
I was just going to continuing hacking away at this but adri was really keen that i post this stuff..
So far with what i’ve got I can cross-build just about anything, but it’s not automated, there is issues with finding and building dependencies.
i’m using XDEV as the cross compiler
a command line such as
env TARGET=mips TARGET_ARCH=mips make _TARGET_CROSS_DEFS= –C /usr/ports/net/asterisk10 all
should get the ball rolling
[-- Attachment #2 --]
#########################
#
# Ports CROSS COMPILING
#
#########################
#
# Variables:
#
# X_STAGING_ROOT = Defaults to ${OBJ_DIR}/${TARGET}.${TARGET_ARCH}
#
X_STAGING_ROOT=${OBJ_DIR}/${TARGET}.${TARGET_ARCH}/rootfs
#TARGET_ARCH!=mips
#ARCH!= ${UNAME} -p
#_TARGET_DEFS = \
# TARGET_VENDOR=${TARGET_VENDOR} \
# TARGET_DEVICE=${TARGET_DEVICE} \
# FREEBSD_SRC_TREE=${FREEBSD_SRC_TREE} \
# TARGET_PROFILES="${TARGET_PROFILES}"
CFLAGS="-I${X_STAGING_ROOT}/lib -I${X_STAGING_ROOT}/include -std=c99"
_TARGET_CROSS_DEFS = \
CHROOTED=no \
DESTDIR=${X_STAGING_ROOT} \
LOCALBASE=${X_STAGING_ROOT} \
CFLAGS="-I${X_STAGING_ROOT}/lib -I${X_STAGING_ROOT}/include -std=c99" \
CXXFLAGS="-I${X_STAGING_ROOT}/include -I${X_STAGING_ROOT}/include/json" \
NO_PKG_REGISTER=yes \
INSTALL_AS_USER=2
PATH=/usr/mips-freebsd/usr/bin:${PATH}
PKG_CONFIG_PATH=${X_STAGING_ROOT}/libdata/pkgconfig/
PKG_DBDIR=${X_STAGING_ROOT}/libdata/var/db/pkg
NO_INSTALL_MANPAGES=yes
WITHOUT_CHECK=yes
NOPORTDOCS=yes
NOPORTEXAMPLES=yes
ac_cv_func_malloc_0_nonnull=yes
ac_cv_func_realloc_0_nonnull=yes
AUTOTOOLS_LOCALBASE=/usr/local
LIBTOOL=/usr/local/bin/libtool
CONFIGURE_HOST=mips-freebsd
LD_LIBRARY_PATH+=${X_STAGING_ROOT}/lib
LD_FLAGS=${X_STAGING_ROOT}/lib
#######
#
# Custom definition variables per-port (WORKAROUND: as to not break/fix /usr/ports/*/*/Makefile's yet!)
#
#######
.for port in ${PKGORIGIN}
.if make(devel/pcre)
_TARGET_CROSS_DEFS = ${TARGET_CROSS_DEFS} \
CC_FOR_BUILD=/usr/bin/cc
.endif
.endfor
#.for port in ${BUILD_DEPENDS_LIST}
# @echo "Start ${port} port building..."
# mkdir -p ${X_STAGING_ROOT}/libdata/var/db/pkg
# cd ${X_STAGING_ROOT} ;${MAKE} PORT_BUILD_DEPEND_CROSS=${port} port-build-depend-cross
#.endfor
# @echo "----> Ports dependencies build done ..."
# Cross-compilation of dependency, build dependency must be built with host env
# LIB and RUN dependency should be builded with cross environment
# Else (FETCH, EXTRACT, PATCH, BUILD dependency) with host env
port-build-depend-cross:
.for port in ${PORT_BUILD_DEPEND_CROSS}
@echo "--------> Start ${port} port building ..."
@echo "------------> Test FETCH EXTRACT PATCH BUILD dependency for ${dir}..."
_DEPENDS=$$(cd ${dir} ; ${MAKE} -VFETCH_DEPENDS -VEXTRACT_DEPENDS -VPATCH_DEPENDS -VBUILD_DEPENDS) ; \
if [ "x$${_DEPENDS}" != "x" ] ; then \
echo "$${_DEPENDS}" ; \
${MAKE} -f /usr/ports/Mk/bsd.port.mk BUILD_DEPENDS="$${_DEPENDS}" depends ; \
fi
@echo "------------> Test LIB dependency for ${dir}..."
@_DEPENDS=$$(cd ${dir} ; ${MAKE} -VLIB_DEPENDS) ; \
echo "LIB_DEPENDS=$${_DEPENDS}" ; \
for _DEP in $${_DEPENDS} ; do \
_DEPTEST=$${_DEP%%:*} ; \
echo "Test if $${_DEPTEST} present" ; \
LIBNAME=$${_DEPTEST%.*} ; \
LIBVER=$${_DEPTEST#*.} ; \
if [ "$${LIBNAME}" = "$${LIBVER}" ] ; then LIBVER="" ; else LIBVER=".$${LIBVER}" ; fi ; \
SONAME=lib$${LIBNAME}.so$${LIBVER} ; \
echo Search for $${SONAME} ; \
MATCHED_LIBS=$$(find ${X_STAGING_ROOT}/lib ${X_STAGING_ROOT}/usr/lib -name $${SONAME}) ; \
_DEPPATH=$${_DEP#*:} ; \
if [ -z $${MATCHED_LIBS} ] ; then \
cd ${ZROUTER_ROOT} ; ${MAKE} ${_TARGET_DEFS} PORT_BUILD_DEPEND_CROSS=$${_DEPPATH} port-build-depend-cross ; \
fi ; \
done
@echo "------------> Test RUN dependency for ${dir}..."
@_DEPENDS=$$(cd ${dir} ; ${MAKE} -VRUN_DEPENDS) ; \
echo "RUN_DEPENDS=$${_DEPENDS}" ; \
for _DEP in $${_DEPENDS} ; do \
_DEPTEST=$${_DEP%%:*} ; \
echo "$${_DEPTEST} is pkg-config?" ; \
if [ "$${_DEPTEST}" = "pkg-config" ] ; then continue ; fi ; \
echo "Test if $${_DEPTEST} present" ; \
_DEPPATH=$${_DEP#*:} ; \
cd ${ZROUTER_ROOT} ; ${MAKE} ${_TARGET_DEFS} PORT_BUILD_DEPEND_CROSS=$${_DEPPATH} port-build-depend-cross ; \
done
@echo "------------> Build ${dir}..."
@cd ${dir} ; ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} generate-plist
@PORT_PLIST=$$( cd ${dir} ; ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VTMPPLIST ) ; \
PORT_STATUS=$$( ${ZROUTER_ROOT}/tools/checkdep.pl libs $${PORT_PLIST} ${WORLDDESTDIR} ) ; \
if [ $${PORT_STATUS} -lt 50 ] ; then \
echo "$${PORT_STATUS}% of files matched, do install" ; \
rm -f ${ZROUTER_OBJ}/ports/${dir}/.install* ; \
echo cd ${dir} ; echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install; \
cd ${dir} ; PATH=${FREEBSD_BUILD_ENV_PATH} ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install || \
( ${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} clean && \
echo ${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} configure && \
${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} configure && \
mv `${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VPATCH_COOKIE` `${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VPATCH_COOKIE` && \
mv `${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VEXTRACT_COOKIE` `${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VEXTRACT_COOKIE` && \
mv `${MAKE} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VCONFIGURE_COOKIE` `${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} -VCONFIGURE_COOKIE` && \
echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} all && \
${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} all && \
echo ${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install && \
${MAKE} ${_TARGET_CROSS_DEFS} WRKDIR=${ZROUTER_OBJ}/ports/${dir} install ) ; \
fi
.endfor
@echo "--------> Done building ${dir} port ..."
# Host tools required for extract, patch, configure, build etc.
# All dependency should be built and installed with host environment
# so now we don`t care about dependency type.
port-build-depend-host:
@echo "Start ${PORTNAME} port building..."
.for port in ${PORT_BUILD_DEPEND_HOST}
@echo "---------> build/install/clean for port ${port} as dependency with host environment"
cd ${dir} ; ${MAKE} install clean
@echo "---------> port ${dir} done (dependency)"
.endfor
[-- Attachment #3 --]
1845c1845
< USE_LDCONFIG= ${DESTDIR}${PREFIX}/lib
---
> USE_LDCONFIG= ${PREFIX}/lib
2204,2208d2203
< .if defined(CROSS_COMPILE)
< .include "${PORTSDIR}/Mk/bsd.cross.mk"
< #CROSS_COMPILE?= ${TARGET_ARCH}-freebsd-
< #CROSS_COMPILE:= ${CROSS_COMPILE:S/^/'CROSS_COMPILE='/}
< .endif
2368,2386d2362
< #__DESTDIRD_PREFIX=
< #_USE_DESTDIR=
< #.for component in ${PREFIX}
< #.if ${__DESTDIRD_PREFIX:M${component}} != "" &&
< #.if ${DESTDIR} != "" &&
< #.if ${PREFIX} != ""
< #__DESTDIRD_PREFIX+= ${DESTDIR}${component}
< #PREFIX=${__DESTDIRD_PREFIX}
< #.endif
< #.endif
< #.endif
< #.endfor
<
< #.for f in ${PREFIX}
< # @${SED} -i.bak -i '' -e 's/^M$$/${DESTDIR}/' ${WRKSRC}/${f}
< #.endfor
<
<
<
2959,2964c2935,2936
< #CONFIGURE_BUILD?= ${ARCH}-freebsd
< #CONFIGURE_BUILD:= ${CONFIGURE_BUILD:S/^/--build=/}
< #CONFIGURE_TARGET?= ${TARGET_ARCH}-freebsd
< #CONFIGURE_TARGET:= ${CONFIGURE_TARGET:S/--target=//}
< CONFIGURE_HOST?= ${TARGET_ARCH}-freebsd
< CONFIGURE_HOST:= ${CONFIGURE_HOST:S/^/--host=/}
---
> CONFIGURE_TARGET?= ${ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_TARGET:= ${CONFIGURE_TARGET:S/--build=//}
2991c2963
< _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET} --with-sysroot=${WORLDDESTDIR}" ; \
---
> _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} ${CONFIGURE_TARGET}" ; \
3761c3733
< CFLAGS+="${CFLAGS}" CPPFLAGS+="${CPPFLAGS}" CXXFLAGS+="${CXXFLAGS}" \
---
> CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \
3768c3740
< ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} ${CONFIGURE_HOST}; then \
---
> ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
3920c3892
< .if defined(USE_GMAKE) && !defined(TARGET_ARCH)
---
> .if defined(USE_GMAKE)
3929d3900
< #.endif
3932a3904
>
4015c3987
< ${MKDIR} -p ${PREFIX}${PKG_DBDIR}; \
---
> ${MKDIR} ${PKG_DBDIR}; \
4029,4030c4001,4002
< if [ -d ${PREFIX}${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
< if [ -d ${PREFIX}${PKG_DBDIR}/${PKGNAME} ]; then \
---
> if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
> if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
4058c4030
< @${MKDIR} ${DESTDIR}/${PREFIX}
---
> @${MKDIR} ${PREFIX}
4060c4032
< if [ -w ${DESTDIR}/${PREFIX}/ ]; then \
---
> if [ -w ${PREFIX}/ ]; then \
4063c4035
< ${ECHO_MSG} "Error: ${DESTDIR}/${PREFIX}/ not writable."; \
---
> ${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \
4074,4076c4046,4048
< ${MTREE_CMD} ${MTREE_ARGS} ${DESTDIR}${PREFIX}/ >/dev/null; \
< if [ ${DESTDIR}${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
< cd ${DESTDIR}${PREFIX}/share/nls; \
---
> ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
> if [ ${PREFIX} = ${LOCALBASE} -a "${MTREE_FILE_DEFAULT}" = "yes" ]; then \
> cd ${PREFIX}/share/nls; \
4111c4083
< @${MKDIR} -p ${DESTDIR}${PREFIX}/${LDCONFIG_DIR}
---
> @${MKDIR} ${PREFIX}/${LDCONFIG_DIR}
4114c4086
< > ${DESTDIR}${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
---
> > ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
4134c4106
< @${MKDIR} ${DESTDIR}${PREFIX}/${LDCONFIG_32DIR}
---
> @${MKDIR} ${PREFIX}/${LDCONFIG_32DIR}
4137c4109
< > ${DESTDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
---
> > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
4273c4245
< match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; if (destdir != "") prefix="$destdir"; next; } \
---
> match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; next; } \
4315c4287
< .if !defined(CHROOTED)
---
> .if defined(CHROOTED)
5698c5670
< @for i in ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}||}; do \
---
> @for i in ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||}; do \
5766c5738
< ${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5775c5747
< ${SED} -ne 's,^${DESTDIR}${PREFIX},,p' >> ${TMPPLIST}
---
> ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
5777c5749
< ${SED} -ne 's,^${DESTDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
---
> ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
5789c5761
< ${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5795c5767
< ${SED} -e 's,^${DESTDIR}${PREFIX}/,,' >> ${TMPPLIST}; \
---
> ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
5802c5774
< @${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${DESTDIR}${PREFIX}/,,}" >> ${TMPPLIST}
---
> @${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
5813c5785
< ${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
5819c5791
< ${SED} -e 's,^${DESTDIR}/${PREFIX}/,,' >> ${TMPPLIST}; \
---
> ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \
5823c5795
< ${SED} -ne 's,^${DESTDIR}/${PREFIX}/,,p' >> ${TMPPLIST}
---
> ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST}
5825,5826c5797,5798
< ${SED} -ne 's,^${DESTDIR}/${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
< @${ECHO_CMD} "@dirrm ${DATADIR:S,^${DESTDIR}/${PREFIX}/,,}" >> ${TMPPLIST}
---
> ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST}
> @${ECHO_CMD} "@dirrm ${DATADIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
5844c5816
< install-info --quiet ${DESTDIR}/${PREFIX}/${INFO_PATH}/$i.info ${DESTDIR}/${PREFIX}/${INFO_PATH}/dir
---
> install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
5847c5819
< @${LS} ${DESTDIR}/${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${DESTDIR}/${PREFIX}/::g >> ${TMPPLIST}
---
> @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
5881c5853
< ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \
---
> ${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
5884c5856
< @${ECHO_CMD} "@cwd ${DESTDIR}/${PREFIX}" >> ${TMPPLIST}
---
> @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5888c5860
< @${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}
---
> @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5890c5862
< ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}${PREFIX}/etc/rc.d/$${i%.sh}; \
---
> ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \
5935c5907
< @if [ ! -d ${DESTDIR}${PREFIX}${PKG_DBDIR} ]; then ${RM} -f ${DESTDIR}${PREFIX}${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
---
> @if [ ! -d ${PKG_DBDIR} ]; then ${RM} -f ${PKG_DBDIR}; ${MKDIR} ${PKG_DBDIR}; fi
5938,5939c5910,5911
< @if [ -e ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY ]; then \
< ${CP} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY /tmp/${PKGNAME}-required-by; \
---
> @if [ -e ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY ]; then \
> ${CP} ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY /tmp/${PKGNAME}-required-by; \
5941c5913
< @${RM} -rf ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}
---
> @${RM} -rf ${PKG_DBDIR}/${PKGNAME}
5943,5948c5915,5920
< @if [ ! -d ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME} ]; then \
< ${ECHO_MSG} "===> Registering installation for ${DESTDIR}/${PKGNAME}"; \
< ${MKDIR} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}; \
< ${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
< ${CP} ${DESCR} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DESC; \
< ${ECHO_CMD} ${COMMENT:Q} > ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
---
> @if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
> ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \
> ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
> ${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
> ${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
> ${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
5950c5922
< ${CP} ${PKGINSTALL} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+INSTALL; \
---
> ${CP} ${PKGINSTALL} ${PKG_DBDIR}/${PKGNAME}/+INSTALL; \
5953c5925
< ${CP} ${PKGDEINSTALL} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \
---
> ${CP} ${PKGDEINSTALL} ${PKG_DBDIR}/${PKGNAME}/+DEINSTALL; \
5956c5928
< ${CP} ${PKGREQ} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \
---
> ${CP} ${PKGREQ} ${PKG_DBDIR}/${PKGNAME}/+REQUIRE; \
5959,5960c5931,5932
< ${CP} ${PKGMESSAGE} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
< ${ECHO_CMD} "@display +DISPLAY" >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
---
> ${CP} ${PKGMESSAGE} ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
> ${ECHO_CMD} "@display +DISPLAY" >> ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
5963,5964c5935,5936
< if [ -d ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
< if ! ${GREP} ^${PKGNAME}$$ ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep/+REQUIRED_BY \
---
> if [ -d ${PKG_DBDIR}/$$dep -a -z `${ECHO_CMD} $$dep | ${GREP} -E ${PKG_IGNORE_DEPENDS}` ]; then \
> if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
5966c5938
< ${ECHO_CMD} ${PKGNAME} >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
---
> ${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
5973c5945
< ${CP} ${MTREE_FILE} ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
---
> ${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
5977c5949
< ${CAT} /tmp/${PKGNAME}-required-by >> ${DESTDIR}${PREFIX}${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
---
> ${CAT} /tmp/${PKGNAME}-required-by >> ${PKG_DBDIR}/${PKGNAME}/+REQUIRED_BY; \
6499c6471
< ${ECHO_CMD} "@cwd ${DESTDIR}${PREFIX}" >> ${TMPPLIST}; \
---
> ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F4D7723DE94A4D228EB46C85464420C9>