[src/trunk]: src Handle dependency on libstdc++ / libc++ in bsd.lib.mk.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Handle dependency on libstdc++ / libc++ in bsd.lib.mk.
From: joerg <joerg%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:16:07 +0000
details:   https://anonhg.NetBSD.org/src/rev/65dc98575962
branches:  trunk
changeset: 789899:65dc98575962
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Sep 12 17:14:20 2013 +0000

description:
Handle dependency on libstdc++ / libc++ in bsd.lib.mk.

diffstat:

 external/bsd/atf/lib/libatf-c++/Makefile |   7 +------
 external/bsd/kyua-cli/lib/Makefile.inc   |   7 +------
 external/bsd/lutok/lib/liblutok/Makefile |   7 +------
 external/mit/xorg/bin/glxinfo/Makefile   |  13 ++++++++-----
 external/mit/xorg/lib/libGLU/Makefile    |   8 +++-----
 share/mk/bsd.lib.mk                      |   9 ++++++++-
 x11/bin/glxinfo/Makefile                 |  13 ++++++++-----
 x11/lib/GLU/Makefile                     |   9 ++++-----
 8 files changed, 34 insertions(+), 39 deletions(-)

diffs (189 lines):

diff -r b54491e99125 -r 65dc98575962 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Thu Sep 12 15:38:04 2013 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Thu Sep 12 17:14:20 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/03/14 07:10:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2013/09/12 17:14:20 joerg Exp $
 
 NOLINT=                # defined
 
@@ -8,11 +8,6 @@
 LIBISCXX=      yes
 
 LIBDPLIBS+=     atf-c  ${.CURDIR}/../libatf-c
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
 LIBDPLIBS+=     m      ${.CURDIR}/../../../../../lib/libm
 
 
diff -r b54491e99125 -r 65dc98575962 external/bsd/kyua-cli/lib/Makefile.inc
--- a/external/bsd/kyua-cli/lib/Makefile.inc    Thu Sep 12 15:38:04 2013 +0000
+++ b/external/bsd/kyua-cli/lib/Makefile.inc    Thu Sep 12 17:14:20 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/02/23 14:16:49 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/12 17:14:20 joerg Exp $
 
 .include "../Makefile.inc"
 
@@ -6,9 +6,4 @@
 LIBISPRIVATE=  yes
 
 LIBDPLIBS+=     lua    ${.CURDIR}/../../../../mit/lua/lib/liblua
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
 LIBDPLIBS+=     m      ${.CURDIR}/../../../../../lib/libm
diff -r b54491e99125 -r 65dc98575962 external/bsd/lutok/lib/liblutok/Makefile
--- a/external/bsd/lutok/lib/liblutok/Makefile  Thu Sep 12 15:38:04 2013 +0000
+++ b/external/bsd/lutok/lib/liblutok/Makefile  Thu Sep 12 17:14:20 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/22 15:14:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 17:14:20 joerg Exp $
 
 #NOLINT=               # defined
 
@@ -8,11 +8,6 @@
 LIBISCXX=      yes
 
 LIBDPLIBS+=     lua    ${.CURDIR}/../../../../mit/lua/lib/liblua
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
 LIBDPLIBS+=     m      ${.CURDIR}/../../../../../lib/libm
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/lutok/dist
diff -r b54491e99125 -r 65dc98575962 external/mit/xorg/bin/glxinfo/Makefile
--- a/external/mit/xorg/bin/glxinfo/Makefile    Thu Sep 12 15:38:04 2013 +0000
+++ b/external/mit/xorg/bin/glxinfo/Makefile    Thu Sep 12 17:14:20 2013 +0000
@@ -1,16 +1,19 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/07 14:07:21 lukem Exp $
+#      $NetBSD: Makefile,v 1.3 2013/09/12 17:14:20 joerg Exp $
 
 NOMAN= # defined
 
 .include <bsd.own.mk>
 
-PROG=  glxinfo
+.if ${MKPIC} == "no" || ${LDSTATIC:U} != ""
+PROG_CXX=      glxinfo
+.else
+PROG=          glxinfo
+.endif
 
 CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
 
-LDADD+=        -lGLU -lGL -lXext -lX11 -lpthread -lstdc++ -lm
-DPADD+=        ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
-DPADD+=        ${LIBSTDCXX} ${LIBM}
+LDADD+=        -lGLU -lGL -lXext -lX11 -lpthread -lm
+DPADD+=        ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
 
 .PATH: ${X11SRCDIR.MesaDemos}/progs/xdemos
 
diff -r b54491e99125 -r 65dc98575962 external/mit/xorg/lib/libGLU/Makefile
--- a/external/mit/xorg/lib/libGLU/Makefile     Thu Sep 12 15:38:04 2013 +0000
+++ b/external/mit/xorg/lib/libGLU/Makefile     Thu Sep 12 17:14:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/05/24 17:18:12 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2013/09/12 17:14:20 joerg Exp $
 
 NOLINT=                1       # XTODO: tess.ln SIGSEGVs lint :(
 
@@ -77,10 +77,8 @@
                Xxf86vm ${.CURDIR}/../libXxf86vm \
                Xfixes  ${.CURDIR}/../libXfixes \
                Xdamage ${.CURDIR}/../libXdamage \
-               drm     ${.CURDIR}/../libdrm
-
-LDADD+=                -lstdc++ -lm
-DPADD+=                ${LIBSTDCXX} ${LIBM}
+               drm     ${.CURDIR}/../libdrm \
+               m       ${NETBSDSRCDIR}/lib/libm
 
 PKGCONFIG=     glu
 PKGDIST.glu=   ${X11SRCDIR.MesaLib}/src/glu
diff -r b54491e99125 -r 65dc98575962 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Thu Sep 12 15:38:04 2013 +0000
+++ b/share/mk/bsd.lib.mk       Thu Sep 12 17:14:20 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.338 2013/09/12 15:36:16 joerg Exp $
+#      $NetBSD: bsd.lib.mk,v 1.339 2013/09/12 17:14:20 joerg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -597,6 +597,13 @@
 
 .if ${LIBISCXX} != "no"
 LIBCC:=        ${CXX}
+. if ${MKLIBCXX} == "yes"
+LIBDPLIBS+=     c++    ${.CURDIR}/../../../../../external/bsd/libc++/lib
+. elif ${HAVE_GCC} == 4
+LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+. else
+LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+. endif
 .else
 LIBCC:=        ${CC}
 .endif
diff -r b54491e99125 -r 65dc98575962 x11/bin/glxinfo/Makefile
--- a/x11/bin/glxinfo/Makefile  Thu Sep 12 15:38:04 2013 +0000
+++ b/x11/bin/glxinfo/Makefile  Thu Sep 12 17:14:20 2013 +0000
@@ -1,14 +1,17 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/23 11:01:20 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2013/09/12 17:14:20 joerg Exp $
 
 .include <bsd.own.mk>
 
-PROG=  glxinfo
+.if ${MKPIC} == "no" || ${LDSTATIC:U} != ""
+PROG_CXX=      glxinfo
+.else
+PROG=          glxinfo
+.endif
 
 CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
 
-LDADD+=        -lGLU -lGL -lXext -lX11 -lpthread -lstdc++ -lm
-DPADD+=        ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
-DPADD+=        ${LIBSTDCXX} ${LIBM}
+LDADD+=        -lGLU -lGL -lXext -lX11 -lpthread -lm
+DPADD+=        ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
 
 .PATH: ${X11SRCDIR.xc}/programs/${PROG}
 
diff -r b54491e99125 -r 65dc98575962 x11/lib/GLU/Makefile
--- a/x11/lib/GLU/Makefile      Thu Sep 12 15:38:04 2013 +0000
+++ b/x11/lib/GLU/Makefile      Thu Sep 12 17:14:20 2013 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.9 2013/05/24 17:44:27 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2013/09/12 17:14:20 joerg Exp $
 
 NOLINT=                1       # XTODO: tess.ln SIGSEGVs lint :(
 
 .include <bsd.own.mk>
 
 LIB=           GLU
+LIBISCXX=      yes
 
 GLUDIR=                ${X11SRCDIR.xc}/extras/ogl-sample/main/gfx/lib/glu
 
@@ -61,10 +62,8 @@
                ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
 
 LIBDPLIBS=\
-       GL      ${.CURDIR}/../GL
-
-LDADD+=                -lstdc++ -lm
-DPADD+=                ${LIBSTDCXX} ${LIBM}
+       GL      ${.CURDIR}/../GL \
+       m       ${NETBSDSRCDIR}/lib/libm
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
Prev by Date: [src/trunk]: src Pass PICFLAGS down to cc-as-as and use __PIC__ to decide if ...
Next by Date: [src/trunk]: src/sys/nfs tyop in comment, from Eivind Evensen via OpenBSD
Previous by Thread: [src/trunk]: src Pass PICFLAGS down to cc-as-as and use __PIC__ to decide if ...
Next by Thread: [src/trunk]: src/sys/nfs tyop in comment, from Eivind Evensen via OpenBSD
Indexes:
Home | Main Index | Thread Index | Old Index