Module Name: src
Committed By: riz
Date: Mon May 7 03:08:35 UTC 2012
Modified Files:
src/tools/binutils [netbsd-6]: Makefile
src/tools/file [netbsd-6]: Makefile
src/tools/gmp [netbsd-6]: Makefile
src/tools/mpc [netbsd-6]: Makefile
src/tools/mpfr [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #207):
tools/gmp/Makefile: revision 1.2
tools/mpfr/Makefile: revision 1.2
tools/file/Makefile: revision 1.7
tools/binutils/Makefile: revision 1.22
tools/mpc/Makefile: revision 1.2
force ac_cv_path_mkdir to be set to nbinstall -d. this will avoid
gmp/configure from trying to use its install-sh for mkdir -p, and
should fix sourcesets created tarball builds.
force set ac_cv_mkdir_path to our install -d program.
fixes the remaining issues with 'sourcesets' and 'tools'.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.4.1 src/tools/binutils/Makefile
cvs rdiff -u -r1.6 -r1.6.8.1 src/tools/file/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/gmp/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpc/Makefile
cvs rdiff -u -r1.1 -r1.1.4.1 src/tools/mpfr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.21 src/tools/binutils/Makefile:1.21.4.1
--- src/tools/binutils/Makefile:1.21 Mon Oct 31 08:14:44 2011
+++ src/tools/binutils/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/10/31 08:14:44 mrg Exp $
+# $NetBSD: Makefile,v 1.21.4.1 2012/05/07 03:08:35 riz Exp $
.include <bsd.own.mk>
@@ -29,6 +29,9 @@ INSTALL_TARGET+=install-gprof
CCADDFLAGS= -I${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
+
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-binutils
Index: src/tools/file/Makefile
diff -u src/tools/file/Makefile:1.6 src/tools/file/Makefile:1.6.8.1
--- src/tools/file/Makefile:1.6 Fri May 8 17:45:22 2009
+++ src/tools/file/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/05/08 17:45:22 christos Exp $
+# $NetBSD: Makefile,v 1.6.8.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/bsd/file/dist
@@ -14,3 +14,6 @@ CONFIGURE_ARGS= --program-prefix=${_TOOL
.NOTPARALLEL:
.include "${.CURDIR}/../Makefile.gnuhost"
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
Index: src/tools/gmp/Makefile
diff -u src/tools/gmp/Makefile:1.1 src/tools/gmp/Makefile:1.1.4.1
--- src/tools/gmp/Makefile:1.1 Mon Jun 20 05:56:46 2011
+++ src/tools/gmp/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:46 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/gmp/dist
@@ -12,3 +12,6 @@ CONFIGURE_ARGS+=--disable-shared
# when variable is used.
CONFIGURE_ENV:= ${CONFIGURE_ENV:NPATH=*:NCFLAGS=*:NCXXFLAGS=*} \
PATH="${TOOLDIR:Q}/bin:$$$$PATH"
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
Index: src/tools/mpc/Makefile
diff -u src/tools/mpc/Makefile:1.1 src/tools/mpc/Makefile:1.1.4.1
--- src/tools/mpc/Makefile:1.1 Mon Jun 20 05:56:46 2011
+++ src/tools/mpc/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:46 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl2/mpc/dist
@@ -9,3 +9,6 @@ CONFIGURE_ARGS+= --with-gmp=${TOOLDIR:Q}
CONFIGURE_ARGS+=--disable-shared
.include "${.CURDIR}/../Makefile.gnuhost"
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
Index: src/tools/mpfr/Makefile
diff -u src/tools/mpfr/Makefile:1.1 src/tools/mpfr/Makefile:1.1.4.1
--- src/tools/mpfr/Makefile:1.1 Mon Jun 20 05:56:45 2011
+++ src/tools/mpfr/Makefile Mon May 7 03:08:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/06/20 05:56:45 mrg Exp $
+# $NetBSD: Makefile,v 1.1.4.1 2012/05/07 03:08:35 riz Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/lgpl3/mpfr/dist
@@ -8,3 +8,6 @@ CONFIGURE_ARGS+= --with-gmp=${TOOLDIR:Q}
CONFIGURE_ARGS+=--disable-shared
.include "${.CURDIR}/../Makefile.gnuhost"
+
+# Force avoiding possibly non-executable install-sh.
+CONFIGURE_ENV+= ac_cv_path_mkdir="${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install -d"
