View | Details | Raw Unified | Return to bug 210820 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/ncurses.mk (-7 / +5 lines)
Lines 48-55 check-depends-ncurses: Link Here
48
	@${FALSE}
48
	@${FALSE}
49
.  endif
49
.  endif
50
50
51
NCURSESRPATH=	/usr/lib:${LOCALBASE}/lib
52
53
.elif ${ncurses_ARGS} == port
51
.elif ${ncurses_ARGS} == port
54
NCURSESBASE=	${LOCALBASE}
52
NCURSESBASE=	${LOCALBASE}
55
NCURSESINC=	${LOCALBASE}/include/ncurses
53
NCURSESINC=	${LOCALBASE}/include/ncurses
Lines 77-91 BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PO Link Here
77
RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
75
RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
78
NCURSESRPATH=		${NCURSESBASE}/lib
76
NCURSESRPATH=		${NCURSESBASE}/lib
79
77
78
.if defined(NCURSES_RPATH)
79
CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
80
.endif
81
LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
82
80
.else
83
.else
81
.error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
84
.error		USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
82
.endif
85
.endif
83
86
84
NCURSESLIB=	${NCURSESBASE}/lib
87
NCURSESLIB=	${NCURSESBASE}/lib
85
88
86
.if defined(NCURSES_RPATH)
87
CFLAGS+=	-Wl,-rpath,${NCURSESRPATH}
88
.endif
89
LDFLAGS+=	-Wl,-rpath=${NCURSESRPATH}
90
91
.endif
89
.endif

Return to bug 210820