From 9a3d6c76009a58746d42d54c284058725131a854 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Thu, 17 Nov 2011 18:56:53 -0600 Subject: [PATCH] Add MKSTATICLIBS switch The MKSTATICLIBS switch, which defaults to yes, controls whether or not static libraries are built and installed. Reported-by: Agostino Sarubbo x-Gentoo-Bug: 378267 x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=378267 --- README | 1 + mk/lib.mk | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README b/README index 646174e7..238af5fd 100644 --- a/README +++ b/README @@ -14,6 +14,7 @@ MKPAM=pam MKPKGCONFIG=no MKRCSYS=prefix MKSELINUX=yes +MKSTATICLIBS=no MKTERMCAP=ncurses MKTERMCAP=termcap PKG_PREFIX=/usr/pkg diff --git a/mk/lib.mk b/mk/lib.mk index c7bd1aae..1cf006c4 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -8,9 +8,15 @@ SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} SHLIB_LINK= lib${LIB}.so SONAME?= ${SHLIB_NAME} +SOBJS+= ${SRCS:.c=.So} + +MKSTATICLIBS?= yes +ifeq (${MKSTATICLIBS},yes) OBJS+= ${SRCS:.c=.o} -SOBJS+= ${OBJS:.o=.So} -_LIBS= lib${LIB}.a ${SHLIB_NAME} +_LIBS+= lib${LIB}.a +endif + +_LIBS+= ${SHLIB_NAME} CLEANFILES+= ${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK} @@ -39,8 +45,10 @@ ${SHLIB_NAME}: ${SOBJS} ${SOBJS} ${LDADD} install: all +ifeq (${MKSTATICLIBS},yes) ${INSTALL} -d ${DESTDIR}${LIBDIR} ${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR} +endif ${INSTALL} -d ${DESTDIR}${SHLIBDIR} ${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}