cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move BUILD_DEPENDS outside of FAKE=lib scope, because it's really hard

Browse Source 
to convince autoconf to work...

Also, ln -sf -> ln -sfh
This commit is contained in:
espie 2005-04-17 13:21:14 +00:00
parent 522533c506
commit 5d3475bf46
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.688 2005/04/17 10:10:07 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.689 2005/04/17 13:21:14 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -1073,15 +1073,14 @@ MAKE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH}
CONFIGURE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH}
DEPBASE=${DEPDIR}${LOCALBASE}
DEPDIR?=${WRKDIR}/dependencies
_build_depends_target=fake
_lib_depends_target=fake
.else
DEPBASE=${LOCALBASE}
DEPDIR=
_build_depends_target=${DEPENDS_TARGET}
_lib_depends_target=${DEPENDS_TARGET}
.endif
_build_depends_target=${DEPENDS_TARGET}
_run_depends_target=${DEPENDS_TARGET}
_regress_depends_target=${DEPENDS_TARGET}
@ -1358,8 +1357,8 @@ ${WRKDIR}/.${_DEP}${_i:C,[|:./<=>*],-,g}: ${_WRKDIR_COOKIE}
exit 1; \
fi; \
mkdir -p ${DEPDIR}/pkgdb ${DEPDIR}/usr ${DEPDIR}/usr/X11R6; \
ln -sf /usr/lib ${DEPDIR}/usr/lib; \
ln -sf /usr/X11R6/lib ${DEPDIR}/usr/X11R6/lib; \
ln -sfh /usr/lib ${DEPDIR}/usr/lib; \
ln -sfh /usr/X11R6/lib ${DEPDIR}/usr/X11R6/lib; \
cd ${PKGREPOSITORY} && PKG_DBDIR=${DEPDIR}/pkgdb pkg_add -F nonroot -Q ${DEPDIR} $$pkg && exit 0;; \
*) \
$$early_exit || ${_force_update_fragment}; \