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

fiddle a bit with LD_LIBRARY_PATH: allow mixed fake/non-fake.

Browse Source 
and create a _set_ld_library_path internal, so that bzip2 can be installed
only as a dependency.
This commit is contained in:
espie 2005-04-23 15:24:49 +00:00
parent 29d3aee2e8
commit 70fcebe40f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*- #-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make: # ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.695 2005/04/23 15:12:19 espie Exp $ # $OpenBSD: bsd.port.mk,v 1.696 2005/04/23 15:24:49 espie Exp $
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp 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 $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
# #
@ -1069,13 +1069,16 @@ _lib_depends_fragment = \
fi fi
.if (${FAKE:L} == "lib" || ${FAKE:L} == "all") && ${USE_FAKE_LIB:L} == "yes" .if (${FAKE:L} == "lib" || ${FAKE:L} == "all") && ${USE_FAKE_LIB:L} == "yes"
PORT_LD_LIBRARY_PATH=${DEPBASE}/lib:${X11BASE}/lib:/usr PORT_LD_LIBRARY_PATH=${DEPBASE}/lib:${LOCALBASE}/lib:${X11BASE}/lib:/usr
_set_ld_library_path=export LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH}
MAKE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH} MAKE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH}
CONFIGURE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH} CONFIGURE_ENV+=LD_LIBRARY_PATH=${PORT_LD_LIBRARY_PATH}
DEPBASE=${DEPDIR}${LOCALBASE} DEPBASE=${DEPDIR}${LOCALBASE}
DEPDIR?=${WRKDIR}/dependencies DEPDIR?=${WRKDIR}/dependencies
_lib_depends_target=fake _lib_depends_target=fake
.else .else
PORT_LD_LIBRARY_PATH=${LOCALBASE}/lib:${X11BASE}/lib:/usr
_set_ld_library_path=:
DEPBASE=${LOCALBASE} DEPBASE=${LOCALBASE}
DEPDIR= DEPDIR=
.endif .endif
@ -1640,6 +1643,7 @@ ${_EXTRACT_COOKIE}: ${_WRKDIR_COOKIE} ${_SYSTRACE_COOKIE}
do-extract: do-extract:
# What EXTRACT normally does: # What EXTRACT normally does:
@PATH=${PORTPATH}; set -e; cd ${WRKDIR}; \ @PATH=${PORTPATH}; set -e; cd ${WRKDIR}; \
${_set_ld_library_path}; \
for archive in ${EXTRACT_ONLY}; do \ for archive in ${EXTRACT_ONLY}; do \
case $$archive in \ case $$archive in \
${EXTRACT_CASES} \ ${EXTRACT_CASES} \