CVS commit: src/tests/net/fdpass
Module Name:src
Committed By: joerg
Date: Thu Sep 13 21:13:34 UTC 2012
Modified Files:
src/tests/net/fdpass: Makefile
Log Message:
Workaround infrastructure bug where additional rpath flags are added for
/lib, resulting in linker warnings for the compat case.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/fdpass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/fdpass/Makefile
diff -u src/tests/net/fdpass/Makefile:1.3 src/tests/net/fdpass/Makefile:1.4
--- src/tests/net/fdpass/Makefile:1.3 Mon Sep 10 11:29:06 2012
+++ src/tests/net/fdpass/Makefile Thu Sep 13 21:13:34 2012
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2012/09/10 11:29:06 adam Exp $
+# $NetBSD: Makefile,v 1.4 2012/09/13 21:13:34 joerg Exp $
#
+SHLIBDIR= /usr/lib
+SHLIBINSTALLDIR= /usr/lib
+
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/net/fdpass
CVS commit: src/tests/net/fdpass
Module Name:src
Committed By: adam
Date: Mon Sep 10 11:29:06 UTC 2012
Modified Files:
src/tests/net/fdpass: Makefile
Log Message:
Fix building with MKCOMPAT=no
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/fdpass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/fdpass/Makefile
diff -u src/tests/net/fdpass/Makefile:1.2 src/tests/net/fdpass/Makefile:1.3
--- src/tests/net/fdpass/Makefile:1.2 Thu Aug 16 10:14:03 2012
+++ src/tests/net/fdpass/Makefile Mon Sep 10 11:29:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/08/16 10:14:03 martin Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/10 11:29:06 adam Exp $
#
.include bsd.own.mk
@@ -11,7 +11,7 @@ PROGS= fdpass64 fdpass32
MAN.fdpass64=# empty
BINDIR.fdpass64= ${TESTSDIR}
-.if ${MACHINE} == sparc64 || ${MACHINE} == amd64
+.if (${MACHINE} == sparc64 || ${MACHINE} == amd64) ${MKCOMPAT} != no
COPTS.fdpass32.c += -m32
LDFLAGS.fdpass32 += -m32
.endif
CVS commit: src/tests/net/fdpass
Module Name:src
Committed By: martin
Date: Thu Aug 16 08:39:43 UTC 2012
Modified Files:
src/tests/net/fdpass: t_fdpass.sh
Log Message:
Do not disturb the atf output with debugging echos
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/fdpass/t_fdpass.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/fdpass/t_fdpass.sh
diff -u src/tests/net/fdpass/t_fdpass.sh:1.1 src/tests/net/fdpass/t_fdpass.sh:1.2
--- src/tests/net/fdpass/t_fdpass.sh:1.1 Mon Aug 13 11:15:06 2012
+++ src/tests/net/fdpass/t_fdpass.sh Thu Aug 16 08:39:43 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_fdpass.sh,v 1.1 2012/08/13 11:15:06 christos Exp $
+# $NetBSD: t_fdpass.sh,v 1.2 2012/08/16 08:39:43 martin Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -32,7 +32,7 @@ have32() {
local src=$(atf_get_srcdir)
if cmp ${src}/fdpass64 ${src}/fdpass32 /dev/null
then
- echo no -m32 support
+ # echo no -m32 support
return 1
else
return 0
CVS commit: src/tests/net/fdpass
Module Name:src
Committed By: martin
Date: Thu Aug 16 10:14:03 UTC 2012
Modified Files:
src/tests/net/fdpass: Makefile
Log Message:
Slightly reaarange, so that the 32bit version actually gets compiled
and linked with -m32.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/fdpass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/fdpass/Makefile
diff -u src/tests/net/fdpass/Makefile:1.1 src/tests/net/fdpass/Makefile:1.2
--- src/tests/net/fdpass/Makefile:1.1 Mon Aug 13 11:15:05 2012
+++ src/tests/net/fdpass/Makefile Thu Aug 16 10:14:03 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/08/13 11:15:05 christos Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/16 10:14:03 martin Exp $
#
.include bsd.own.mk
@@ -8,15 +8,20 @@ TESTSDIR= ${TESTSBASE}/net/fdpass
TESTS_SH= t_fdpass
PROGS= fdpass64 fdpass32
-SRCS.fdpass64= fdpass.c
MAN.fdpass64=# empty
BINDIR.fdpass64= ${TESTSDIR}
.if ${MACHINE} == sparc64 || ${MACHINE} == amd64
-CFLAGS.fdpass32= -m32
+COPTS.fdpass32.c += -m32
+LDFLAGS.fdpass32 += -m32
.endif
-SRCS.fdpass32= fdpass.c
MAN.fdpass32=# empty
BINDIR.fdpass32= ${TESTSDIR}
+
+fdpass64.c fdpass32.c: fdpass.c
+ ln -s ${.CURDIR}/fdpass.c ${.TARGET}
+
+CLEANFILES += fdpass64.c fdpass32.c
+
.include bsd.test.mk
