Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Oct 2011 23:43:51 +0000 (UTC)
From:      Stanislav Sedov <stas@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r226122 - head/share/mk
Message-ID:  <201110072343.p97NhpFK032806@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: stas
Date: Fri Oct  7 23:43:51 2011
New Revision: 226122
URL: http://svn.freebsd.org/changeset/base/226122

Log:
  - ${WRKSRC} might be missing when the autotools fixup is running.
    Account for this.
  
  Reported by:	Mykola Dzham <i@levsha.me>

Modified:
  head/share/mk/bsd.port.mk

Modified: head/share/mk/bsd.port.mk
==============================================================================
--- head/share/mk/bsd.port.mk	Fri Oct  7 23:12:33 2011	(r226121)
+++ head/share/mk/bsd.port.mk	Fri Oct  7 23:43:51 2011	(r226122)
@@ -18,10 +18,10 @@ _WITHOUT_SRCCONF=
 .if !defined(BEFOREPORTMK) && !defined(INOPTIONSMK)
 # Work around an issue where FreeBSD 10.0 is detected as FreeBSD 1.x.
 run-autotools-fixup:
-	find ${WRKSRC} -type f \( -name config.libpath -o \
+	test -d ${WRKSRC} && find ${WRKSRC} -type f \( -name config.libpath -o \
 		-name config.rpath -o -name configure -o -name libtool.m4 \) \
 		-exec sed -i '' -e 's/freebsd1\*)/SHOULDNOTMATCHANYTHING1)/' \
-		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} +
+		-e 's/freebsd\[123\]\*)/SHOULDNOTMATCHANYTHING2)/' {} + || /usr/bin/true
 
 .ORDER: run-autotools run-autotools-fixup do-configure
 do-configure: run-autotools-fixup



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110072343.p97NhpFK032806>