summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2017-06-01 13:30:24 +0000
committerjlam <jlam@pkgsrc.org>2017-06-01 13:30:24 +0000
commit9d7b4cef4b2fcd434bb915ef69841314b9f9900d (patch)
tree6a656919b45c3d1c3f43026f349e235274001f93 /mk
parentd350f3460b4d99ef572faf0fe112178561ed599e (diff)
downloadpkgsrc-9d7b4cef4b2fcd434bb915ef69841314b9f9900d.tar.gz
Use public SHLIB_TYPE instead of private _OPSYS_SHLIB_TYPE.
Diffstat (limited to 'mk')
-rw-r--r--mk/emulator/netbsd-compat.mk6
-rw-r--r--mk/pgsql.buildlink3.mk4
2 files changed, 4 insertions, 6 deletions
diff --git a/mk/emulator/netbsd-compat.mk b/mk/emulator/netbsd-compat.mk
index da458d1d7b2..fc333eb97b8 100644
--- a/mk/emulator/netbsd-compat.mk
+++ b/mk/emulator/netbsd-compat.mk
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd-compat.mk,v 1.5 2015/05/03 15:01:11 spz Exp $
+# $NetBSD: netbsd-compat.mk,v 1.6 2017/06/01 13:30:26 jlam Exp $
#
# COMPAT_* for NetBSD -- see options(4).
#
@@ -11,9 +11,7 @@
# The executable format of the native operating system.
#
-NATIVE_EXEC_FMT= ${_NATIVE_EXEC_FMT_cmd:sh}
-_NATIVE_EXEC_FMT_cmd= sh ${.CURDIR}/../../mk/scripts/shlib-type \
- ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
+NATIVE_EXEC_FMT= ${SHLIB_TYPE}
# Most NetBSD (i386) software need netbsd>=1.6
.for _version_ in ${EMUL_REQD:Mnetbsd>=*:S/netbsd>=//}
diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index 386a273991e..f6f61eb7d1d 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.44 2017/05/24 19:51:12 adam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.45 2017/06/01 13:30:26 jlam Exp $
#
# User-settable variables:
#
@@ -32,7 +32,7 @@ PGSQL_VERSIONS_ACCEPTED?= 96 95 94 93 92
_PGSQL_VERSION_${pv}_OK= yes
.endfor
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
PG_LIB_EXT=dylib
.else
PG_LIB_EXT=so