diff options
| author | jlam <jlam@pkgsrc.org> | 2003-01-08 08:33:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-01-08 08:33:54 +0000 |
| commit | 27d0cedb053ae0f4129372239ede2568910a3819 (patch) | |
| tree | 2976a4ad2555727184b50977a526d33f1859597b /mk/buildlink2 | |
| parent | 3256e7202a73119bd4841b0e5449fb1a2e2ed7fd (diff) | |
| download | pkgsrc-27d0cedb053ae0f4129372239ede2568910a3819.tar.gz | |
Teach buildlink2 about ${_OPSYS_RPATH_NAME} instead of just using -Wl,-R
everywhere.
Diffstat (limited to 'mk/buildlink2')
| -rw-r--r-- | mk/buildlink2/bsd.buildlink2.mk | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/mk/buildlink2/bsd.buildlink2.mk b/mk/buildlink2/bsd.buildlink2.mk index 5c69d098ef0..e5e310230b1 100644 --- a/mk/buildlink2/bsd.buildlink2.mk +++ b/mk/buildlink2/bsd.buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink2.mk,v 1.71 2003/01/07 21:56:10 jlam Exp $ +# $NetBSD: bsd.buildlink2.mk,v 1.72 2003/01/08 08:33:54 jlam Exp $ # # An example package buildlink2.mk file: # @@ -57,11 +57,8 @@ MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" CONFIGURE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" MAKE_ENV+= BUILDLINK_X11_DIR="${BUILDLINK_X11_DIR}" _BLNK_CPPFLAGS= -I${LOCALBASE}/include -.if ${OPSYS} == "IRIX" -_BLNK_LDFLAGS= -L${LOCALBASE}/lib -Wl,-rpath,${LOCALBASE}/lib -.else -_BLNK_LDFLAGS= -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -.endif +_BLNK_LDFLAGS= -L${LOCALBASE}/lib \ + -Wl,${_OPSYS_RPATH_NAME}${LOCALBASE}/lib _BLNK_OPSYS= ${OPSYS} BUILDLINK_SHELL?= ${SH} @@ -96,11 +93,7 @@ BUILD_DEPENDS+= x11-links>=0.10:../../pkgtools/x11-links _BLNK_X11_DIR= ${LOCALBASE}/share/x11-links . endif _BLNK_CPPFLAGS+= -I${X11BASE}/include -.if ${OPSYS} == "IRIX" -_BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib -.else -_BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -.endif +_BLNK_LDFLAGS+= -L${X11BASE}/lib -Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib .endif CONFIGURE_ENV+= BUILDLINK_CPPFLAGS="${_BLNK_CPPFLAGS}" |