kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't rely on differences in the value of DISTNAME that rely on

Browse source 
"immediate" versus "lazy" evaluation of the value.  Just explicitly
define a variable (COMPAT_PKG) that holds the value that's needed in
each of the compat* packages, and use it within Makefile.common.

This was an attempt to solve PR pkg/36863, but it doesn't look like
pkglint or lintpkgsrc understand this more straightforward variable
construction either.
This commit is contained in:
jlam 2007-08-30 16:54:06 +00:00
parent 1f0cfcf013
commit 5dca58e72d
12 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emulators/compat12/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.33 2007/08/21 22:49:04 jlam Exp $ # $NetBSD: Makefile,v 1.34 2007/08/30 16:54:06 jlam Exp $
DISTNAME= compat12 # overridden below COMPAT_PKG= compat12 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.2 NETBSD_VERSION= 1.2
PKGREVISION= 1 PKGREVISION= 1

4
emulators/compat13/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.29 2007/08/21 22:49:06 jlam Exp $ # $NetBSD: Makefile,v 1.30 2007/08/30 16:54:06 jlam Exp $
DISTNAME= compat13 # overridden below COMPAT_PKG= compat13 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.3 NETBSD_VERSION= 1.3
PKGREVISION= 3 PKGREVISION= 3

4
emulators/compat14/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.21 2007/08/21 22:49:08 jlam Exp $ # $NetBSD: Makefile,v 1.22 2007/08/30 16:54:07 jlam Exp $
DISTNAME= compat14 # overridden below COMPAT_PKG= compat14 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.4 NETBSD_VERSION= 1.4
PKGREVISION= 2 PKGREVISION= 2

4
emulators/compat15-extras/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:13 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:07 jlam Exp $
DISTNAME= compat15-extras # overridden below COMPAT_PKG= compat15 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.5 NETBSD_VERSION= 1.5
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.5/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.5/index.html

4
emulators/compat15/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:11 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:07 jlam Exp $
DISTNAME= compat15 # overridden below COMPAT_PKG= compat15 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.5 NETBSD_VERSION= 1.5
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.5/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.5/index.html

4
emulators/compat16-extras/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:17 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
DISTNAME= compat16-extras # overridden below COMPAT_PKG= compat16 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.6 NETBSD_VERSION= 1.6
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.6/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.6/index.html

4
emulators/compat16/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2007/08/21 22:49:14 jlam Exp $ # $NetBSD: Makefile,v 1.11 2007/08/30 16:54:07 jlam Exp $
DISTNAME= compat16 # overridden below COMPAT_PKG= compat16 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 1.6 NETBSD_VERSION= 1.6
HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.6/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-1.6/index.html

4
emulators/compat20-extras/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:19 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
DISTNAME= compat20-extras # overridden below COMPAT_PKG= compat20 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 2.0 NETBSD_VERSION= 2.0
HOMEPAGE= http://www.NetBSD.org/Releases/formal-2.0/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-2.0/index.html

4
emulators/compat20/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:18 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
DISTNAME= compat20 # overridden below COMPAT_PKG= compat20 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 2.0 NETBSD_VERSION= 2.0
HOMEPAGE= http://www.NetBSD.org/Releases/formal-2.0/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-2.0/index.html

4
emulators/compat30-extras/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2007/08/27 21:44:37 jlam Exp $ # $NetBSD: Makefile,v 1.3 2007/08/30 16:54:08 jlam Exp $
DISTNAME= compat30-extras # overridden below COMPAT_PKG= compat30 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 3.0 NETBSD_VERSION= 3.0
HOMEPAGE= http://www.NetBSD.org/Releases/formal-3.0/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-3.0/index.html

4
emulators/compat30/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:20 jlam Exp $ # $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
DISTNAME= compat30 # overridden below COMPAT_PKG= compat30 # for compat_netbsd/Makefile.common
NETBSD_VERSION= 3.0 NETBSD_VERSION= 3.0
HOMEPAGE= http://www.NetBSD.org/Releases/formal-3.0/index.html HOMEPAGE= http://www.NetBSD.org/Releases/formal-3.0/index.html

4
emulators/compat_netbsd/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.6 2007/08/28 14:00:45 jlam Exp $ # $NetBSD: Makefile.common,v 1.7 2007/08/30 16:54:08 jlam Exp $
# #
# Common infrastructure for NetBSD compat* packages. # Common infrastructure for NetBSD compat* packages.
# #
@ -71,7 +71,7 @@ NATIVE_EXEC_FMT= ${_NATIVE_EXEC_FMT_cmd:sh}
_NATIVE_EXEC_FMT_cmd= sh ${.CURDIR}/../../mk/scripts/shlib-type \ _NATIVE_EXEC_FMT_cmd= sh ${.CURDIR}/../../mk/scripts/shlib-type \
${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q} ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
.include "${PKGSRCDIR}/emulators/${DISTNAME:C/-.*//}/emulator.mk" .include "${PKGSRCDIR}/emulators/${COMPAT_PKG}/emulator.mk"
# #
# Different combinations of the native executable format and the emulated # Different combinations of the native executable format and the emulated