diff options
author | ryoon <ryoon@pkgsrc.org> | 2014-05-10 23:01:26 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2014-05-10 23:01:26 +0000 |
commit | 9acab585dc456882ae3e0319cb2dbc3685ea3701 (patch) | |
tree | c128253b06d37f7d45579f1b30ece73699aee3c4 /pkgtools/bootstrap-mk-files | |
parent | 618dbd3e19b7acf22f2f5d1a9df7f607fe5c1ef4 (diff) | |
download | pkgsrc-9acab585dc456882ae3e0319cb2dbc3685ea3701.tar.gz |
Update to 20140510
Fix PR pkg/48793: treat OpenBSD 5.4 or later as ELF platform
Patch from obache@, thank you.
Diffstat (limited to 'pkgtools/bootstrap-mk-files')
-rw-r--r-- | pkgtools/bootstrap-mk-files/Makefile | 4 | ||||
-rw-r--r-- | pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index f0342b1a272..2a84cbb8372 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2014/03/14 22:03:16 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2014/05/10 23:01:26 ryoon Exp $ -PKGNAME= bootstrap-mk-files-20140314 +PKGNAME= bootstrap-mk-files-20140510 CATEGORIES= pkgtools CONFLICTS+= mk-files-[0-9]* diff --git a/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in b/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in index 79ab2a80165..47048901c21 100644 --- a/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in +++ b/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in @@ -1,4 +1,4 @@ -# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.3 2008/11/15 13:06:42 schwarz Exp $ +# $NetBSD: OpenBSD.bsd.own.mk.in,v 1.4 2014/05/10 23:01:26 ryoon Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -106,6 +106,7 @@ NOPIC?=1 .if ${MACHINE_ARCH} == "alpha" || \ ${MACHINE_ARCH} == "powerpc" || \ ${MACHINE_ARCH} == "sparc" || \ + ${OS_VERSION} >= 5.4 || \ ( ${MACHINE_ARCH} == "i386" && ${OS_VERSION} >= 3.4 ) OBJECT_FMT?=ELF .else |