bmake: add upstream patch to fix MK_AUTO_OBJ.

This commit is contained in:
Christian Neukirchen 2015-04-17 12:12:55 +02:00
parent 5a8c1d36f7
commit 96cc623922
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,45 @@
--- bmake/mk/auto.obj.mk 21 Nov 2014 19:52:45 -0000 1.9
+++ bmake/mk/auto.obj.mk 16 Apr 2015 16:43:46 -0000
@@ -50,11 +50,12 @@ __objdir:= ${__objdir:tA}
__objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \
${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \
${Mkdirs}; Mkdirs ${__objdir}
+__objdir:= ${__objdir:tA}
.endif
# This causes make to use the specified directory as .OBJDIR
.OBJDIR: ${__objdir}
.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != ""
-.error could not use ${__objdir}
+.error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
.endif
.endif
.endif
--- bmake/mk/install-mk 3 Apr 2015 18:23:25 -0000 1.108
+++ bmake/mk/install-mk 16 Apr 2015 16:42:02 -0000
@@ -70,7 +70,7 @@
# sjg@crufty.net
#
-MK_VERSION=20150401
+MK_VERSION=20150411
OWNER=
GROUP=
MODE=444
--- bmake/mk/own.mk 18 Jul 2013 05:46:24 -0000 1.27
+++ bmake/mk/own.mk 16 Apr 2015 16:39:19 -0000
@@ -89,6 +89,7 @@ OPTIONS_DEFAULT_NO+= DPADD_MK
# process options
OPTIONS_DEFAULT_NO+= \
+ AUTO_OBJ \
INSTALL_AS_USER \
GPROF \
LIBTOOL \
@@ -98,7 +99,6 @@ OPTIONS_DEFAULT_NO+= \
OPTIONS_DEFAULT_YES+= \
ARCHIVE \
AUTODEP \
- AUTO_OBJ \
CRYPTO \
DOC \
DPADD_MK \

View File

@ -1,7 +1,7 @@
# Template file for 'bmake' # Template file for 'bmake'
pkgname=bmake pkgname=bmake
version=20150410 version=20150410
revision=1 revision=2
create_wrksrc=yes create_wrksrc=yes
short_desc="Portable version of the NetBSD make build tool" short_desc="Portable version of the NetBSD make build tool"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"