Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: /, mk/
Date: Fri, 18 Nov 2011 16:03:04
Message-Id: 9a3d6c76009a58746d42d54c284058725131a854.WilliamH@gentoo
1 commit: 9a3d6c76009a58746d42d54c284058725131a854
2 Author: William Hubbs <williamh <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 18 00:56:53 2011 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 18 14:55:30 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9a3d6c76
7
8 Add MKSTATICLIBS switch
9
10 The MKSTATICLIBS switch, which defaults to yes, controls whether or not
11 static libraries are built and installed.
12
13 Reported-by: Agostino Sarubbo <ago <AT> autistici.org>
14 x-Gentoo-Bug: 378267
15 x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=378267
16
17 ---
18 README | 1 +
19 mk/lib.mk | 12 ++++++++++--
20 2 files changed, 11 insertions(+), 2 deletions(-)
21
22 diff --git a/README b/README
23 index 646174e..238af5f 100644
24 --- a/README
25 +++ b/README
26 @@ -14,6 +14,7 @@ MKPAM=pam
27 MKPKGCONFIG=no
28 MKRCSYS=prefix
29 MKSELINUX=yes
30 +MKSTATICLIBS=no
31 MKTERMCAP=ncurses
32 MKTERMCAP=termcap
33 PKG_PREFIX=/usr/pkg
34
35 diff --git a/mk/lib.mk b/mk/lib.mk
36 index c7bd1aa..1cf006c 100644
37 --- a/mk/lib.mk
38 +++ b/mk/lib.mk
39 @@ -8,9 +8,15 @@ SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR}
40 SHLIB_LINK= lib${LIB}.so
41 SONAME?= ${SHLIB_NAME}
42
43 +SOBJS+= ${SRCS:.c=.So}
44 +
45 +MKSTATICLIBS?= yes
46 +ifeq (${MKSTATICLIBS},yes)
47 OBJS+= ${SRCS:.c=.o}
48 -SOBJS+= ${OBJS:.o=.So}
49 -_LIBS= lib${LIB}.a ${SHLIB_NAME}
50 +_LIBS+= lib${LIB}.a
51 +endif
52 +
53 +_LIBS+= ${SHLIB_NAME}
54
55 CLEANFILES+= ${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK}
56
57 @@ -39,8 +45,10 @@ ${SHLIB_NAME}: ${SOBJS}
58 ${SOBJS} ${LDADD}
59
60 install: all
61 +ifeq (${MKSTATICLIBS},yes)
62 ${INSTALL} -d ${DESTDIR}${LIBDIR}
63 ${INSTALL} -m ${LIBMODE} lib${LIB}.a ${DESTDIR}${LIBDIR}
64 +endif
65 ${INSTALL} -d ${DESTDIR}${SHLIBDIR}
66 ${INSTALL} -m ${LIBMODE} ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
67 ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}