Sat May 10 23:01:26 2014 UTC ()
Update to 20140510
Fix PR pkg/48793: treat OpenBSD 5.4 or later as ELF platform
Patch from obache@, thank you.


(ryoon)
diff -r1.41 -r1.42 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in
cvs diff -r1.41 -r1.42 pkgsrc/pkgtools/bootstrap-mk-files/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2014/03/14 22:03:16 1.41
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile 2014/05/10 23:01:26 1.42
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.41 2014/03/14 22:03:16 ryoon Exp $ 1# $NetBSD: Makefile,v 1.42 2014/05/10 23:01:26 ryoon Exp $
2 2
3PKGNAME= bootstrap-mk-files-20140314 3PKGNAME= bootstrap-mk-files-20140510
4CATEGORIES= pkgtools 4CATEGORIES= pkgtools
5 5
6CONFLICTS+= mk-files-[0-9]* 6CONFLICTS+= mk-files-[0-9]*
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.pkgsrc.org/ 9HOMEPAGE= http://www.pkgsrc.org/
10COMMENT= *.mk files for the bootstrap bmake utility 10COMMENT= *.mk files for the bootstrap bmake utility
11 11
12NO_PKGTOOLS_REQD_CHECK= # defined 12NO_PKGTOOLS_REQD_CHECK= # defined
13BOOTSTRAP_PKG= yes 13BOOTSTRAP_PKG= yes
14 14
15NO_BUILD= yes 15NO_BUILD= yes
16 16
cvs diff -r1.3 -r1.4 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in (expand / switch to unified diff)

--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in 2008/11/15 13:06:42 1.3
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in 2014/05/10 23:01:26 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.3 2008/11/15 13:06:42 schwarz Exp $ 1# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.4 2014/05/10 23:01:26 ryoon Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6# XXX On systems with a Berkeley-style make, perhaps we ought to check 6# XXX On systems with a Berkeley-style make, perhaps we ought to check
7# XXX for and source a file other than /etc/mk.conf 7# XXX for and source a file other than /etc/mk.conf
8 8
9.if defined(MAKECONF) && exists(${MAKECONF}) 9.if defined(MAKECONF) && exists(${MAKECONF})
10.include "${MAKECONF}" 10.include "${MAKECONF}"
11.elif exists(@SYSCONFDIR@/mk.conf) 11.elif exists(@SYSCONFDIR@/mk.conf)
12.include "@SYSCONFDIR@/mk.conf" 12.include "@SYSCONFDIR@/mk.conf"
13.elif exists(/etc/mk.conf) 13.elif exists(/etc/mk.conf)
14.include "/etc/mk.conf" 14.include "/etc/mk.conf"
@@ -96,26 +96,27 @@ NOLINT=1 @@ -96,26 +96,27 @@ NOLINT=1
96NOPROFILE=1 96NOPROFILE=1
97NOPIC?=1 97NOPIC?=1
98.endif 98.endif
99 99
100# Data-driven table using make variables to control how  100# Data-driven table using make variables to control how
101# toolchain-dependent targets and shared libraries are built 101# toolchain-dependent targets and shared libraries are built
102# for different platforms and object formats. 102# for different platforms and object formats.
103# OBJECT_FMT: currently either "ELF" or "a.out". 103# OBJECT_FMT: currently either "ELF" or "a.out".
104# SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries. 104# SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries.
105# 105#
106.if ${MACHINE_ARCH} == "alpha" || \ 106.if ${MACHINE_ARCH} == "alpha" || \
107 ${MACHINE_ARCH} == "powerpc" || \ 107 ${MACHINE_ARCH} == "powerpc" || \
108 ${MACHINE_ARCH} == "sparc" || \ 108 ${MACHINE_ARCH} == "sparc" || \
 109 ${OS_VERSION} >= 5.4 || \
109 ( ${MACHINE_ARCH} == "i386" && ${OS_VERSION} >= 3.4 ) 110 ( ${MACHINE_ARCH} == "i386" && ${OS_VERSION} >= 3.4 )
110OBJECT_FMT?=ELF 111OBJECT_FMT?=ELF
111.else 112.else
112OBJECT_FMT?=a.out 113OBJECT_FMT?=a.out
113.endif 114.endif
114 115
115# Location of the file that contains the major and minor numbers of the 116# Location of the file that contains the major and minor numbers of the
116# version of a shared library. If this file exists a shared library 117# version of a shared library. If this file exists a shared library
117# will be built by <bsd.lib.mk>. 118# will be built by <bsd.lib.mk>.
118SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version 119SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version
119 120
120# GNU sources and packages sometimes see architecture names differently. 121# GNU sources and packages sometimes see architecture names differently.
121# This table maps an architecture name to its GNU counterpart. 122# This table maps an architecture name to its GNU counterpart.