Module Name: src
Committed By: joerg
Date: Thu Sep 12 17:14:20 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/kyua-cli/lib: Makefile.inc
src/external/bsd/lutok/lib/liblutok: Makefile
src/external/mit/xorg/bin/glxinfo: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/share/mk: bsd.lib.mk
src/x11/bin/glxinfo: Makefile
src/x11/lib/GLU: Makefile
Log Message:
Handle dependency on libstdc++ / libc++ in bsd.lib.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-cli/lib/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/lutok/lib/liblutok/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/glxinfo/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.3 -r1.4 src/x11/bin/glxinfo/Makefile
cvs rdiff -u -r1.9 -r1.10 src/x11/lib/GLU/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.19 src/external/bsd/atf/lib/libatf-c++/Makefile:1.20
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.19 Thu Mar 14 07:10:06 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Sep 12 17:14:20 2013
@@ -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 @@ LIB= atf-c++
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
Index: src/external/bsd/kyua-cli/lib/Makefile.inc
diff -u src/external/bsd/kyua-cli/lib/Makefile.inc:1.1 src/external/bsd/kyua-cli/lib/Makefile.inc:1.2
--- src/external/bsd/kyua-cli/lib/Makefile.inc:1.1 Sat Feb 23 14:16:49 2013
+++ src/external/bsd/kyua-cli/lib/Makefile.inc Thu Sep 12 17:14:20 2013
@@ -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 @@ LIBISCXX= yes
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
Index: src/external/bsd/lutok/lib/liblutok/Makefile
diff -u src/external/bsd/lutok/lib/liblutok/Makefile:1.2 src/external/bsd/lutok/lib/liblutok/Makefile:1.3
--- src/external/bsd/lutok/lib/liblutok/Makefile:1.2 Fri Feb 22 15:14:31 2013
+++ src/external/bsd/lutok/lib/liblutok/Makefile Thu Sep 12 17:14:20 2013
@@ -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 @@ LIB= lutok
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
Index: src/external/mit/xorg/bin/glxinfo/Makefile
diff -u src/external/mit/xorg/bin/glxinfo/Makefile:1.2 src/external/mit/xorg/bin/glxinfo/Makefile:1.3
--- src/external/mit/xorg/bin/glxinfo/Makefile:1.2 Sun Sep 7 14:07:21 2008
+++ src/external/mit/xorg/bin/glxinfo/Makefile Thu Sep 12 17:14:20 2013
@@ -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
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.11 src/external/mit/xorg/lib/libGLU/Makefile:1.12
--- src/external/mit/xorg/lib/libGLU/Makefile:1.11 Fri May 24 17:18:12 2013
+++ src/external/mit/xorg/lib/libGLU/Makefile Thu Sep 12 17:14:20 2013
@@ -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 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
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
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.338 src/share/mk/bsd.lib.mk:1.339
--- src/share/mk/bsd.lib.mk:1.338 Thu Sep 12 15:36:16 2013
+++ src/share/mk/bsd.lib.mk Thu Sep 12 17:14:20 2013
@@ -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 @@ LDADD+= -lgcc
.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
Index: src/x11/bin/glxinfo/Makefile
diff -u src/x11/bin/glxinfo/Makefile:1.3 src/x11/bin/glxinfo/Makefile:1.4
--- src/x11/bin/glxinfo/Makefile:1.3 Tue Sep 23 11:01:20 2003
+++ src/x11/bin/glxinfo/Makefile Thu Sep 12 17:14:20 2013
@@ -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}
Index: src/x11/lib/GLU/Makefile
diff -u src/x11/lib/GLU/Makefile:1.9 src/x11/lib/GLU/Makefile:1.10
--- src/x11/lib/GLU/Makefile:1.9 Fri May 24 17:44:27 2013
+++ src/x11/lib/GLU/Makefile Thu Sep 12 17:14:20 2013
@@ -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= ${SRCS.libutil} ${SRCS.libtess} \
${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>
