Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F108293629
D7459.id19176.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
836 B
Referenced Files
None
Subscribers
None
D7459.id19176.diff
View Options
Index: Mk/Uses/ncurses.mk
===================================================================
--- Mk/Uses/ncurses.mk
+++ Mk/Uses/ncurses.mk
@@ -48,8 +48,6 @@
@${FALSE}
. endif
-NCURSESRPATH= /usr/lib:${LOCALBASE}/lib
-
.elif ${ncurses_ARGS} == port
NCURSESBASE= ${LOCALBASE}
NCURSESINC= ${LOCALBASE}/include/ncurses
@@ -77,15 +75,15 @@
RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
NCURSESRPATH= ${NCURSESBASE}/lib
+.if defined(NCURSES_RPATH)
+CFLAGS+= -Wl,-rpath,${NCURSESRPATH}
+.endif
+LDFLAGS+= -Wl,-rpath=${NCURSESRPATH}
+
.else
.error USES=ncurses only accept 'port' and 'base' as arguments, got ${ncurses_ARGS}
.endif
NCURSESLIB= ${NCURSESBASE}/lib
-.if defined(NCURSES_RPATH)
-CFLAGS+= -Wl,-rpath,${NCURSESRPATH}
-.endif
-LDFLAGS+= -Wl,-rpath=${NCURSESRPATH}
-
.endif
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jan 24, 2:48 PM (18 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16089730
Default Alt Text
D7459.id19176.diff (836 B)
Attached To
Mode
D7459: Fix ncurses to not add /usr/lib to rpath.
Attached
Detach File
Event Timeline
Log In to Comment