diff options
| author | sketch <sketch> | 2004-11-12 20:25:41 +0000 |
|---|---|---|
| committer | sketch <sketch> | 2004-11-12 20:25:41 +0000 |
| commit | 4743f9ddbe40214f66abfef19c65d974756bc710 (patch) | |
| tree | b08f3938b0a560b9161b0678d0df29347314ff50 /mk/buildlink3 | |
| parent | 97703bc746e18509898e926aff382d20ecb67bc7 (diff) | |
| download | pkgsrc-4743f9ddbe40214f66abfef19c65d974756bc710.tar.gz | |
Introduce LIBABISUFFIX for platforms which require ABI-dependant library paths.
Diffstat (limited to 'mk/buildlink3')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index c053bd6522d..4a8ab83e0f0 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.160 2004/11/12 04:57:31 jlam Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.161 2004/11/12 20:25:41 sketch Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -348,7 +348,7 @@ BUILDLINK_CPPFLAGS.${_pkg_}?= # empty BUILDLINK_LDFLAGS.${_pkg_}?= # empty BUILDLINK_LIBS.${_pkg_}?= # empty BUILDLINK_INCDIRS.${_pkg_}?= include -BUILDLINK_LIBDIRS.${_pkg_}?= lib${ABI} +BUILDLINK_LIBDIRS.${_pkg_}?= lib${LIBABISUFFIX} . if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull) BUILDLINK_RPATHDIRS.${_pkg_}?= ${BUILDLINK_LIBDIRS.${_pkg_}} . else @@ -452,11 +452,11 @@ BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib # uses X11. # .if defined(USE_X11) -. if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${ABI}) -BUILDLINK_LDFLAGS+= -L${X11BASE}/lib${ABI} +. if empty(BUILDLINK_LDFLAGS:M-L${X11BASE}/lib${LIBABISUFFIX}) +BUILDLINK_LDFLAGS+= -L${X11BASE}/lib${LIBABISUFFIX} . endif -. if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}) -BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI} +. if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}) +BUILDLINK_LDFLAGS+= ${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX} . endif .endif @@ -516,7 +516,7 @@ buildlink-directories: ${_PKG_SILENT}${_PKG_DEBUG}${LN} -sf ${BUILDLINK_DIR} ${BUILDLINK_X11_DIR} .endif ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/include - ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${ABI} + ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${BUILDLINK_DIR}/lib${LIBABISUFFIX} # The following variables are all optionally defined and control which # package files are symlinked into ${BUILDLINK_DIR} and how their names |