Index: lib/ncurses/ncurses/Makefile =================================================================== --- lib/ncurses/ncurses/Makefile +++ lib/ncurses/ncurses/Makefile @@ -169,6 +169,11 @@ LIBADD+= tinfow SHLIB_LDSCRIPT= libncursesw.ldscript +STATIC_LDSCRIPT= libncursesw.aldscript +CLEANFILES+= ${STATIC_LDSCRIPT} + +libncursesw.aldscript: + @${ECHO} "INPUT(-lncursesw_real -ltinfow)" >$@ libncurses.ldscript: @${ECHO} "INPUT(${SHLIB_NAME} AS NEEDED(-ltinfow))" >$@ @@ -180,4 +185,13 @@ expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c +all: ${STATIC_LDSCRIPT} + +install-aldscript: ${STATIC_LDSCRIPT} + ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} ${STATIC_LDSCRIPT} ${DESTDIR}${_LIBDI}/lib${LIB}.a + +realinstall: install-aldscript + + .include Index: share/mk/bsd.lib.mk =================================================================== --- share/mk/bsd.lib.mk +++ share/mk/bsd.lib.mk @@ -271,9 +271,12 @@ .endif .if defined(LIB) && !empty(LIB) -_LIBS= lib${LIB_PRIVATE}${LIB}.a +.if defined(STATIC_LDSCRIPT) +_STATICLIB_SUFFIX= _real +.endif +_LIBS= lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a -lib${LIB_PRIVATE}${LIB}.a: ${OBJS} ${STATICOBJS} +lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} ${AR} ${ARFLAGS} ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} @@ -477,7 +480,7 @@ _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}.a ${DESTDIR}${_LIBDIR}/ + ${_INSTALLFLAGS} lib${LIB_PRIVATE}${LIB}${_STATICLIB_SUFFIX}.a ${DESTDIR}${_LIBDIR}/ .endif .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},dev} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \