pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk mk: use direct include paths



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9823eff9e097
branches:  trunk
changeset: 335736:9823eff9e097
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jun 30 21:28:28 2019 +0000

description:
mk: use direct include paths

This saves a few system calls since the included files are searched first
in .PARSEDIR and only then in .CURDIR.

diffstat:

 mk/oss.buildlink3.mk     |  6 +++---
 mk/oss.builtin.mk        |  4 ++--
 mk/pthread.buildlink3.mk |  6 +++---
 mk/pthread.builtin.mk    |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r 6adacf69e21f -r 9823eff9e097 mk/oss.buildlink3.mk
--- a/mk/oss.buildlink3.mk      Sun Jun 30 21:25:46 2019 +0000
+++ b/mk/oss.buildlink3.mk      Sun Jun 30 21:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.12 2017/05/28 21:53:06 maya Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.13 2019/06/30 21:28:28 rillig Exp $
 #
 # This Makefile fragment is included by packages that require an Open Sound
 # System (OSS) implementation.  After inclusion of this file, the following
@@ -11,12 +11,12 @@
 #
 OSS_BUILDLINK3_MK:=    ${OSS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
+.include "bsd.prefs.mk"
 
 .if !defined(_OSS_TYPE)
 _OSS_TYPE=             none
 CHECK_BUILTIN.oss:=    yes
-.  include "../../mk/oss.builtin.mk"
+.  include "oss.builtin.mk"
 CHECK_BUILTIN.oss:=    no
 .  if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS])
 _OSS_TYPE=             native
diff -r 6adacf69e21f -r 9823eff9e097 mk/oss.builtin.mk
--- a/mk/oss.builtin.mk Sun Jun 30 21:25:46 2019 +0000
+++ b/mk/oss.builtin.mk Sun Jun 30 21:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: oss.builtin.mk,v 1.5 2016/09/18 05:25:18 richard Exp $
+# $NetBSD: oss.builtin.mk,v 1.6 2019/06/30 21:28:28 rillig Exp $
 
 BUILTIN_PKG:=  oss
 
@@ -8,7 +8,7 @@
                                        linux/soundcard.h       \
                                        sys/soundcard.h
 
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
 
 ###
 ### Determine if there is a built-in implementation of the package and
diff -r 6adacf69e21f -r 9823eff9e097 mk/pthread.buildlink3.mk
--- a/mk/pthread.buildlink3.mk  Sun Jun 30 21:25:46 2019 +0000
+++ b/mk/pthread.buildlink3.mk  Sun Jun 30 21:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.32 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.33 2019/06/30 21:28:28 rillig Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -79,12 +79,12 @@
 # can actually be used to replace a native pthreads.
 _PKG_PTHREAD_COMPAT_PATTERNS=  *-*-*
 
-.include "../../mk/bsd.fast.prefs.mk"
+.include "bsd.fast.prefs.mk"
 
 PTHREAD_OPTS?= # empty
 
 CHECK_BUILTIN.pthread:=  yes
-.include "../../mk/pthread.builtin.mk"
+.include "pthread.builtin.mk"
 CHECK_BUILTIN.pthread:=  no
 
 #
diff -r 6adacf69e21f -r 9823eff9e097 mk/pthread.builtin.mk
--- a/mk/pthread.builtin.mk     Sun Jun 30 21:25:46 2019 +0000
+++ b/mk/pthread.builtin.mk     Sun Jun 30 21:28:28 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.builtin.mk,v 1.15 2013/11/23 09:10:14 obache Exp $
+# $NetBSD: pthread.builtin.mk,v 1.16 2019/06/30 21:28:28 rillig Exp $
 
 BUILTIN_PKG:=  pthread
 
@@ -6,7 +6,7 @@
 BUILTIN_FIND_HEADERS_VAR=      H_PTHREAD
 BUILTIN_FIND_HEADERS.H_PTHREAD=        pthread.h
 
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
 
 ###
 ### Determine if there is a built-in implementation of the package and



Home | Main Index | Thread Index | Old Index