Fix some build issues exposed by the cwrappers build:

  - Use REPLACE_SH for echo -n.
  - Use LD_LIBRARY_PATH for tests to find pre-installed libraries.
  - Fix parallel build issues.

4 files changed, 30 insertions, 4 deletions

diff --git a/devel/deforaos-libsystem/Makefile b/devel/deforaos-libsystem/Makefile
index 5d8fdbbef98..7a32acbe0af 100644
--- a/devel/deforaos-libsystem/Makefile
+++ b/devel/deforaos-libsystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/09/16 19:25:51 khorben Exp $
+# $NetBSD: Makefile,v 1.8 2014/09/23 12:06:49 jperkin Exp $
 #
 
 DISTNAME=	libSystem-0.2.0
@@ -16,6 +16,8 @@ MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	INSTALL=${INSTALL}
 
+REPLACE_SH=	tests/tests.sh
+
 BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.20
 .include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/deforaos-libsystem/distinfo b/devel/deforaos-libsystem/distinfo
index 5d03b04096a..60ac3513dcb 100644
--- a/devel/deforaos-libsystem/distinfo
+++ b/devel/deforaos-libsystem/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2014/09/16 19:25:51 khorben Exp $
+$NetBSD: distinfo,v 1.5 2014/09/23 12:06:49 jperkin Exp $
 
 SHA1 (libSystem-0.2.0.tar.gz) = c264070ff4034fbdc97aae3f7e694f84e7898365
 RMD160 (libSystem-0.2.0.tar.gz) = 8159d1baee58cff3a4adf5f514a1d5c2f45aedbe
 Size (libSystem-0.2.0.tar.gz) = 60538 bytes
 SHA1 (patch-data_pkgconfig.sh) = 7c40652087c604cff593a320e97259c453633c74
-SHA1 (patch-tests_tests.sh) = 530e8a01f2f06876cee5f29e5ba1bdb351d6bda4
+SHA1 (patch-src_Makefile) = 564623fdf246a4dc3a33bb265b6d6069bca58e29
+SHA1 (patch-tests_tests.sh) = 189b91d02ae0a83ff8e881a93b70984045456948
diff --git a/devel/deforaos-libsystem/patches/patch-src_Makefile b/devel/deforaos-libsystem/patches/patch-src_Makefile
new file mode 100644
index 00000000000..230488112fb
--- /dev/null
+++ b/devel/deforaos-libsystem/patches/patch-src_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makefile,v 1.1 2014/09/23 12:06:49 jperkin Exp $
+
+Do not try to build targets that are created by existing targets, causes
+problems with parallel builds and is unnecessary.
+
+--- src/Makefile.orig	2014-09-14 17:53:40.000000000 +0000
++++ src/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS	= libSystem.a libSystem.so.0.0 libSystem.so.0 libSystem.so
++TARGETS	= libSystem.a libSystem.so.0.0
+ PREFIX	= /usr/local
+ DESTDIR	=
+ LIBDIR	= $(PREFIX)/lib
diff --git a/devel/deforaos-libsystem/patches/patch-tests_tests.sh b/devel/deforaos-libsystem/patches/patch-tests_tests.sh
index 36ee1ce4c16..18012a828b0 100644
--- a/devel/deforaos-libsystem/patches/patch-tests_tests.sh
+++ b/devel/deforaos-libsystem/patches/patch-tests_tests.sh
@@ -1,9 +1,19 @@
-$NetBSD: patch-tests_tests.sh,v 1.1 2014/09/16 19:25:51 khorben Exp $
+$NetBSD: patch-tests_tests.sh,v 1.2 2014/09/23 12:06:49 jperkin Exp $
 
 Avoid building the (experimental) Python binding.
+Use LD_LIBRARY_PATH to find pre-installed libraries.
 
 --- tests/tests.sh.orig	2014-08-29 19:23:48.000000000 +0000
 +++ tests/tests.sh
+@@ -50,7 +50,7 @@
+ 	echo -n "$test:" 1>&2
+ 	(echo
+ 	echo "Testing: ./$test" "$@"
+-	"./$test" "$@") >> "$target" 2>&1
++	env LD_LIBRARY_PATH=../src "./$test" "$@") >> "$target" 2>&1
+ 	res=$?
+ 	if [ $res -ne 0 ]; then
+ 		echo " FAIL" 1>&2
 @@ -103,7 +103,7 @@ _test "includes"
  _test "string"
  _test "variable"