Baptiste Daroussin wrote:
> This breaks using fmake from ports because of usage of :U in sys.mk
Oops - sorry.
I saw Warner posted a patch for this which looked ok, but doesn't appear
to have been committed.
> is compatible with FreeBSD 9 (not that I'm just speaking about sys.mk not
> other
> pa
Bryan Drewery wrote:
> > head/share/mk/local.sys.mk
>
> I'm bothered by the amount of local.* files committed in the tree. I
> expect, as a user and working in a downstream product, that a local.*
> file is MINE, not FREEBSD. The pattern of using 'local' is quite common
> as a *user* file.
Yes
Author: sjg
Date: Mon Dec 19 21:50:59 2016
New Revision: 310299
URL: https://svnweb.freebsd.org/changeset/base/310299
Log:
Import bmake-20161212
From ChangeLog
2016-12-12 Simon J. Gerraty
* Makefile (_MAKE_VERSION): 20161212
Merge with NetBSD make, pick up
Author: sjg
Date: Mon Dec 19 21:51:13 2016
New Revision: 310300
URL: https://svnweb.freebsd.org/changeset/base/310300
Log:
tag bmake-20161212
Added:
vendor/NetBSD/bmake/20161212/
- copied from r310299, vendor/NetBSD/bmake/dist/
___
svn-src-all@
(r310304)
@@ -1,3 +1,32 @@
+2016-12-12 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20161212
+ Merge with NetBSD make, pick up
+ o main.c: look for obj.${MACHINE}-${MACHINE_ARCH} too.
+
+2016-12-09 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20161209
--- head/share/mk/meta.stage.mk Fri Dec 23 00:38:43 2016(r310436)
+++ head/share/mk/meta.stage.mk Fri Dec 23 02:57:00 2016(r310437)
@@ -1,5 +1,5 @@
# $FreeBSD$
-# $Id: meta.stage.mk,v 1.45 2016/05/26 03:59:09 sjg Exp $
+# $Id: meta.s
2017
(r321963)
+++ stable/10/contrib/bmake/ChangeLog Thu Aug 3 01:40:05 2017
(r321964)
@@ -1,3 +1,296 @@
+2017-07-20 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170720
+ Merge with NetBSD make, pick up
+ o compat.c: pass SIGINT etc onto child and wait
00:39:45 2017
(r316946)
+++ vendor/NetBSD/bmake/dist/ChangeLog Sat Apr 15 00:51:18 2017
(r316947)
@@ -1,8 +1,35 @@
+2017-04-13 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170413
+ Merge with NetBSD make, pick up
+ o main.c: when setting .OBJDIR
Author: sjg
Date: Sat Apr 15 00:51:35 2017
New Revision: 316948
URL: https://svnweb.freebsd.org/changeset/base/316948
Log:
tag bmake-20170413
Added:
vendor/NetBSD/bmake/20170413/
- copied from r316947, vendor/NetBSD/bmake/dist/
___
svn-src-all@
Apr 15 00:51:35 2017
(r316948)
+++ head/contrib/bmake/ChangeLogSat Apr 15 01:44:45 2017
(r316949)
@@ -1,8 +1,35 @@
+2017-04-13 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170413
+ Merge with NetBSD make, pick up
+ o main.c: when setting .OBJDIR
Author: sjg
Date: Sat Apr 15 01:52:49 2017
New Revision: 316950
URL: https://svnweb.freebsd.org/changeset/base/316950
Log:
Update to latest, handle case of __objdir=obj
Modified:
head/share/mk/auto.obj.mk
Modified: head/share/mk/auto.obj.mk
===
Author: sjg
Date: Sat Apr 15 03:28:13 2017
New Revision: 316952
URL: https://svnweb.freebsd.org/changeset/base/316952
Log:
Latest version, we need to realpath anyway to check if an obj
dependency is also a src dependency.
Modified:
head/share/mk/meta2deps.py
Modified: head/share/mk/meta2de
Author: sjg
Date: Tue Apr 18 23:59:15 2017
New Revision: 317106
URL: https://svnweb.freebsd.org/changeset/base/317106
Log:
If MAKEOBJDIRPREFIX is a prefix match for .CURDIR, then __objdir is .CURDIR
Reviewed by: bdrewery
Modified:
head/share/mk/auto.obj.mk
Modified: head/share/mk/auto.
Author: sjg
Date: Sat Sep 16 05:42:27 2017
New Revision: 323637
URL: https://svnweb.freebsd.org/changeset/base/323637
Log:
Use OBJS_SRCS_FILTER to control setting OBJS from SRCS
Some makefiles do reachover builds.
In some cases it is convenient to list subdirs of the distribution
in SRC
Author: sjg
Date: Fri Mar 3 01:56:55 2017
New Revision: 314577
URL: https://svnweb.freebsd.org/changeset/base/314577
Log:
Allow building mkimg as cross-tool
For linux the mmap offset must also be page aligned, and we
need to disable macros like __FBSDID()
Change the linux osdep_uuid
Author: sjg
Date: Mon Mar 6 19:55:07 2017
New Revision: 314788
URL: https://svnweb.freebsd.org/changeset/base/314788
Log:
tag bmake-20170301
Added:
vendor/NetBSD/bmake/20170301/
- copied from r314787, vendor/NetBSD/bmake/dist/
___
svn-src-all@
==
--- vendor/NetBSD/bmake/dist/ChangeLog Mon Mar 6 19:39:31 2017
(r314786)
+++ vendor/NetBSD/bmake/dist/ChangeLog Mon Mar 6 19:54:54 2017
(r314787)
@@ -1,3 +1,32 @@
+2017-03-01 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170301
+ Merge
Mon Mar 6 22:46:49 2017
(r314807)
+++ head/contrib/bmake/ChangeLogMon Mar 6 23:02:33 2017
(r314808)
@@ -1,3 +1,32 @@
+2017-03-01 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170301
+ Merge with NetBSD make, pick up
+ o main.c: use -C arg as is
-1,7 +1,7 @@
# $FreeBSD$
-# $Id: meta.stage.mk,v 1.47 2016/12/07 23:07:49 sjg Exp $
+# $Id: meta.stage.mk,v 1.48 2017/03/01 22:48:07 sjg Exp $
#
-# @(#) Copyright (c) 2011, Simon J. Gerraty
+# @(#) Copyright (c) 2011-2017, Simon J. Gerraty
#
# This file is provided in the hope tha
Bryan Drewery wrote:
> On 3/6/17 3:13 PM, Simon J. Gerraty wrote:
> > -# DEP_RELDIR to be the RELDIR (path relative to SRCTOP) for
> > +# DEP_RELDIR to be the the RELDIR (path relative to SRCTOP) for
>
> Oops, "the the".
Doh!
Author: sjg
Date: Tue Mar 7 01:42:30 2017
New Revision: 314816
URL: https://svnweb.freebsd.org/changeset/base/314816
Log:
Fix typo in comment.
Modified:
head/share/mk/dirdeps.mk
Modified: head/share/mk/dirdeps.mk
==
Author: sjg
Date: Sat Mar 11 20:28:31 2017
New Revision: 315088
URL: https://svnweb.freebsd.org/changeset/base/315088
Log:
Do not consider using -C arg "as is" for .CURDIR unless it starts with /.
Reported by:bdrewery
Modified:
head/contrib/bmake/main.c
Modified: head/contrib/bmake/
-1,3 +1,29 @@
+2017-04-20 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170420
+ Merge with NetBSD make, pick up
+ o main.c: only use -C arg "as is" if it contains no
+ relative component.
+
+2017-04-18 Simon J. Gerraty
+
+ * Makefile (_MAK
Author: sjg
Date: Thu Apr 20 23:12:50 2017
New Revision: 317233
URL: https://svnweb.freebsd.org/changeset/base/317233
Log:
tag bmake-20170420
Added:
vendor/NetBSD/bmake/20170420/
- copied from r317232, vendor/NetBSD/bmake/dist/
___
svn-src-all@
00:24:59 2017
(r317238)
+++ head/contrib/bmake/ChangeLogFri Apr 21 00:45:44 2017
(r317239)
@@ -1,3 +1,29 @@
+2017-04-20 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170420
+ Merge with NetBSD make, pick up
+ o main.c: only use -C arg "as i
Author: sjg
Date: Fri Apr 21 22:19:13 2017
New Revision: 317274
URL: https://svnweb.freebsd.org/changeset/base/317274
Log:
Str_Match: fix closure tests for [^] and add unit-test.
Modified:
head/contrib/bmake/str.c
head/contrib/bmake/unit-tests/modmatch.exp
head/contrib/bmake/unit-tests/mo
Author: sjg
Date: Wed May 10 22:24:09 2017
New Revision: 318161
URL: https://svnweb.freebsd.org/changeset/base/318161
Log:
Ensure buf2 is in scope
Modified:
head/contrib/bmake/main.c
Modified: head/contrib/bmake/main.c
=
@@
+2017-05-10 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170510
+ Merge with NetBSD make, pick up
+ o main.c: Main_SetObjdir: ensure buf2 is in scope
+
+2017-05-08 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170505
+ see mk/ChangeLog
+
+2017
==
--- head/contrib/bmake/ChangeLogWed May 10 22:40:27 2017
(r318162)
+++ head/contrib/bmake/ChangeLogWed May 10 22:45:05 2017
(r318163)
@@ -1,3 +1,29 @@
+2017-05-10 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170510
+ Merge with
Author: sjg
Date: Thu May 11 19:49:22 2017
New Revision: 318194
URL: https://svnweb.freebsd.org/changeset/base/318194
Log:
Tell bmake (meta mode) to ignore changes to /usr/local/etc/libmap.d/*
Differential Revision:D10685
Reviewed by: bdrewery
Modified:
head/share/mk/local.met
Konstantin Belousov wrote:
> > Consider a downstream vendor who has support for signed binary
> > executions. If rtld allows a backdoor around exec(2) to run an unsigned
> > binary, that could be a problem for them. It is on them to add support
> > to exec(2) to validate the special case of exec
Ngie Cooper (yaneurabeya) wrote:
> > These should not be stored uuencoded. It serves no purpose other
> > than bloating the repo and causing spammy commit mails like this one
> > where we got a huge tail of garbage output.
The tests appear to contain generated filesystem images.
eg. img-1x1-512-
Author: sjg
Date: Thu Jun 8 12:39:03 2017
New Revision: 319691
URL: https://svnweb.freebsd.org/changeset/base/319691
Log:
Release phil to the wild
Reviewed by: theraven
Modified:
svnadmin/conf/mentors
Modified: svnadmin/conf/mentors
Cy Schubert wrote:
> This commit breaks at the below:
Can you pls confirm which compiler hit the error below?
It has been suggested that this might only have bitten gcc...
which would explain why Phil didn't hit it.
>
> ===> lib/libxo (all)
> /home/cy/current/contrib/libxo/libxo/libxo.c:242:17:
==
--- stable/11/contrib/bmake/ChangeLog Mon Jun 12 23:50:30 2017
(r319883)
+++ stable/11/contrib/bmake/ChangeLog Tue Jun 13 00:22:15 2017
(r319884)
@@ -1,3 +1,169 @@
+2017-05-10 Simon J. Gerraty
===
--- vendor/NetBSD/bmake/dist/ChangeLog Sat Jul 15 18:25:59 2017
(r321026)
+++ vendor/NetBSD/bmake/dist/ChangeLog Sat Jul 15 18:43:39 2017
(r321027)
@@ -1,3 +1,16 @@
+2017-07-11 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170711
+ f
Author: sjg
Date: Sat Jul 15 18:44:03 2017
New Revision: 321028
URL: https://svnweb.freebsd.org/changeset/base/321028
Log:
tag bmake-20170711
Added:
vendor/NetBSD/bmake/20170711/
- copied from r321027, vendor/NetBSD/bmake/dist/
___
svn-src-all@
==
--- head/contrib/bmake/ChangeLogSat Jul 15 20:53:08 2017
(r321035)
+++ head/contrib/bmake/ChangeLogSat Jul 15 21:19:27 2017
(r321036)
@@ -1,3 +1,16 @@
+2017-07-11 Simon J. Gerraty
==
--- vendor/NetBSD/bmake/dist/ChangeLog Sun Jul 23 22:38:00 2017
(r321401)
+++ vendor/NetBSD/bmake/dist/ChangeLog Mon Jul 24 00:52:52 2017
(r321402)
@@ -1,3 +1,10 @@
+2017-07-20 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170720
+ Merge with NetBSD make, pick up
Author: sjg
Date: Mon Jul 24 00:53:43 2017
New Revision: 321403
URL: https://svnweb.freebsd.org/changeset/base/321403
Log:
tag bmake-20170720
Added:
vendor/NetBSD/bmake/20170720/
- copied from r321402, vendor/NetBSD/bmake/dist/
___
svn-src-all@
==
--- head/contrib/bmake/ChangeLogMon Jul 24 04:00:43 2017
(r321409)
+++ head/contrib/bmake/ChangeLogMon Jul 24 04:38:05 2017
(r321410)
@@ -1,3 +1,10 @@
+2017-07-20 Simon J. Gerraty
+
+ * Makefile (_MAKE_VERSION): 20170720
==
--- stable/11/contrib/bmake/ChangeLog Fri Jul 28 12:22:32 2017
(r321652)
+++ stable/11/contrib/bmake/ChangeLog Fri Jul 28 15:43:36 2017
(r321653)
@@ -1,3 +1,23 @@
+2017-07-20 Simon J. Gerraty
+
+ * Makefile
Bryan Drewery wrote:
> My concern is that checked in 'local' files should not be changed by
> FreeBSD. I should not have to fight conflicts of _my customizations_
> against _FreeBSD customizations (against bmake upstream)_. There is so
> much logic in these local.* files, they seem more aptly name
Author: sjg
Date: Fri Sep 11 00:19:49 2015
New Revision: 287636
URL: https://svnweb.freebsd.org/changeset/base/287636
Log:
Handle default MAKEOBJDIR for META_MODE.
If MAKEOBJDIRPREFIX is set, use it for default OBJROOT.
If MAKEOBJDIR is empty or not a suitable value (no '/')
set a default
Julian Elischer wrote:
> >If MAKEOBJDIR is empty or not a suitable value (no '/')
> >set a default that works.
>
> if not suitable.. it should error (with a really explicit error
> message), not do something else..
How about:
$ MAKEOBJDIR='obj.${MACHINE}' make -C bin/cat -DWITH_META_MO
Author: sjg
Date: Sat May 30 15:08:52 2015
New Revision: 283767
URL: https://svnweb.freebsd.org/changeset/base/283767
Log:
Define SRCTOP in src.sys.mk
Because src.sys.mk should only ever be found in the src tree
we can use its position (.PARSEDIR) to set SRCTOP.
Reviewed by: bapt, i
Author: sjg
Date: Sat May 30 15:13:18 2015
New Revision: 283768
URL: https://svnweb.freebsd.org/changeset/base/283768
Log:
Use SRCTOP when defining ROOTOBJDIR
Excplicitly check rather than assume that .CURDIR is
a component of .OBJDIR
Otherwise check for OBJTOP and if that is a match us
Author: sjg
Date: Sat Jun 6 01:18:28 2015
New Revision: 284050
URL: https://svnweb.freebsd.org/changeset/base/284050
Log:
Add support for dependent options
Reviewed by: imp
Modified:
head/share/mk/bsd.mkopt.mk
Modified: head/share/mk/bsd.mkopt.mk
==
/ChangeLog Wed Jun 10 20:10:48 2015
(r284243)
@@ -1,3 +1,9 @@
+2015-06-06 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20150606
+ Merge with NetBSD make, pick up
+ o make.1: document .OBJDIR target
+
2015-05-05 Simon J. Gerraty
* Makefile (MAKE_VERSION
Author: sjg
Date: Wed Jun 10 20:11:28 2015
New Revision: 284244
URL: https://svnweb.freebsd.org/changeset/base/284244
Log:
tag bmake-20150606
Added:
- copied from r284243, vendor/NetBSD/bmake/dist/
Directory Properties:
vendor/NetBSD/bmake/20150606/ (props changed)
==
--- head/contrib/bmake/ChangeLogThu Jun 11 03:02:40 2015
(r284253)
+++ head/contrib/bmake/ChangeLogThu Jun 11 04:00:22 2015
(r284254)
@@ -1,3 +1,9 @@
+2015-06-06 Simon J. Gerraty
+
+ * Makefile (MAKE_VERSION): 20150606
+ M
Author: sjg
Date: Thu Jun 11 04:22:17 2015
New Revision: 284255
URL: https://svnweb.freebsd.org/changeset/base/284255
Log:
Remove NO_OBJ
For meta mode we will want objdirs.
Differential Revision:D2748
Reviewed by: brooks imp
Modified:
head/include/arpa/Makefile
head/inc
Garrett Cooper wrote:
> Silly question — how will items that cannot build/install with ${.OBJDIR} !=
> ${.CURDIR} build in meta mode?
As they always did.
If .OBJDIR == .CURDIR, then you simply won't get meta files, and hence
no auto dependency collection.
_
Author: sjg
Date: Thu Jun 11 14:25:53 2015
New Revision: 284268
URL: https://svnweb.freebsd.org/changeset/base/284268
Log:
Use INCLUDEDIR rather than hard coded /usr/include
Differential Revision:D2748
Reviewed by: brooks imp
Modified:
head/usr.bin/kdump/Makefile
head/usr.bi
Author: sjg
Date: Thu Jun 11 21:09:03 2015
New Revision: 284287
URL: https://svnweb.freebsd.org/changeset/base/284287
Log:
Ensure SYMLINKS fully specified
Differential Revision: D2748
Reviewed by: brooks
Modified:
head/share/colldef/Makefile
head/share/mklocale/Makefile
head/
Author: sjg
Date: Thu Jun 11 21:11:33 2015
New Revision: 284288
URL: https://svnweb.freebsd.org/changeset/base/284288
Log:
Do not override variables on command line that build needs to change.
It is sufficient to explicitly set DEPENDFILE in env for each sub-make.
Modified:
head/share/mk
Author: sjg
Date: Thu Jun 11 21:13:05 2015
New Revision: 284289
URL: https://svnweb.freebsd.org/changeset/base/284289
Log:
Misc fixes from projects/bmake
Differential Revision: D2748
Reviewed by: brooks imp
Modified:
head/gnu/lib/libreadline/readline/Makefile
head/gnu/usr.bin/c
Author: sjg
Date: Fri Jun 12 14:30:27 2015
New Revision: 284321
URL: https://svnweb.freebsd.org/changeset/base/284321
Log:
Get rid of some more NO_OBJs
Differential Revision: D2748
Modified:
head/gnu/usr.bin/groff/font/devX100-12/Makefile
head/gnu/usr.bin/groff/font/devX100/Makef
Author: sjg
Date: Sat Jun 13 15:36:13 2015
New Revision: 284341
URL: https://svnweb.freebsd.org/changeset/base/284341
Log:
Use ${CRUNCHGEN} rather than bare word.
Reviewed by: brooks
Modified:
head/share/mk/bsd.crunchgen.mk
Modified: head/share/mk/bsd.crunchgen.mk
==
Author: sjg
Date: Sat Jun 13 19:20:56 2015
New Revision: 284345
URL: https://svnweb.freebsd.org/changeset/base/284345
Log:
Add META_MODE support.
Off by default, build behaves normally.
WITH_META_MODE we get auto objdir creation, the ability to
start build from anywhere in the tree.
Author: sjg
Date: Sat Jun 13 19:52:35 2015
New Revision: 284349
URL: https://svnweb.freebsd.org/changeset/base/284349
Log:
We no longer need CSU_DIR.i386
and until there is an alternative we need MK_INSTALL_AS_USER=yes
Modified:
head/share/mk/local.meta.sys.mk
Modified: head/share/mk/local
Author: sjg
Date: Sat Jun 13 19:53:24 2015
New Revision: 284350
URL: https://svnweb.freebsd.org/changeset/base/284350
Log:
removed extra keyword
Modified:
head/bin/cat/Makefile.depend
Modified: head/bin/cat/Makefile.depend
=
Author: sjg
Date: Sun Jun 14 03:27:22 2015
New Revision: 284366
URL: https://svnweb.freebsd.org/changeset/base/284366
Log:
Avoid anoying warning
Modified:
head/share/mk/bsd.init.mk
Modified: head/share/mk/bsd.init.mk
===
Author: sjg
Date: Sun Jun 14 03:28:48 2015
New Revision: 284368
URL: https://svnweb.freebsd.org/changeset/base/284368
Log:
Avoid trailing white-space
Modified:
head/share/mk/local.gendirdeps.mk
Modified: head/share/mk/local.gendirdeps.mk
==
Author: sjg
Date: Sun Jun 14 03:28:25 2015
New Revision: 284367
URL: https://svnweb.freebsd.org/changeset/base/284367
Log:
Watch out for bin/cat in host stage tree
Modified:
head/share/mk/local.dirdeps.mk
Modified: head/share/mk/local.dirdeps.mk
==
Author: sjg
Date: Sun Jun 14 03:29:24 2015
New Revision: 284369
URL: https://svnweb.freebsd.org/changeset/base/284369
Log:
We cannot build makewhatis and mandoc
Modified:
head/targets/pseudo/userland/Makefile.depend
Modified: head/targets/pseudo/userland/Makefile.depend
=
Author: sjg
Date: Sun Jun 14 03:30:39 2015
New Revision: 284370
URL: https://svnweb.freebsd.org/changeset/base/284370
Log:
Create proper targets for linux*syscalls.c
Modified:
head/usr.bin/kdump/Makefile
Modified: head/usr.bin/kdump/Makefile
==
Author: sjg
Date: Sun Jun 14 03:31:23 2015
New Revision: 284371
URL: https://svnweb.freebsd.org/changeset/base/284371
Log:
Needs libxo
Modified:
head/libexec/ftpd/Makefile.depend
Modified: head/libexec/ftpd/Makefile.depend
=
Author: sjg
Date: Sun Jun 14 03:32:49 2015
New Revision: 284372
URL: https://svnweb.freebsd.org/changeset/base/284372
Log:
Need to provide -I for meta mode
Modified:
head/usr.bin/xlint/llib/Makefile
Modified: head/usr.bin/xlint/llib/Makefile
==
Author: sjg
Date: Sun Jun 14 03:33:27 2015
New Revision: 284373
URL: https://svnweb.freebsd.org/changeset/base/284373
Log:
Avoid circular dependency with nm
Modified:
head/gnu/usr.bin/binutils/libbfd/Makefile
Modified: head/gnu/usr.bin/binutils/libbfd/Makefile
===
Author: sjg
Date: Sun Jun 14 03:34:09 2015
New Revision: 284374
URL: https://svnweb.freebsd.org/changeset/base/284374
Log:
NO_WARNS when building for host
Modified:
head/usr.bin/mkcsmapper_static/Makefile
head/usr.bin/mkesdb_static/Makefile
Modified: head/usr.bin/mkcsmapper_static/Makefile
Author: sjg
Date: Sun Jun 14 16:31:06 2015
New Revision: 284383
URL: https://svnweb.freebsd.org/changeset/base/284383
Log:
Latest clang uses openat(2).
If the pathname is absolute or dirfd is AT_FDCWD we can
handle it exactly like open(2).
Otherwise we output an A record to indicate tha
Bryan Drewery wrote:
> Is anything remaining from the projects/bmake branch?
I don't think so - apart from some merge botches ;-)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mai
Garrett Cooper wrote:
> > Great. More breakage:
> >
> > $ fmake buildworld
Babt has committed enough changes to head in recent months that building
with fmake is no longer an option.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mai
Adrian Chadd wrote:
> Hi,
>
> + make -j 4 buildworld __MAKE_CONF=/builds/FreeBSD_HEAD/make.conf
> make: "/builds/FreeBSD_HEAD/Makefile" line 102: Malformed conditional
> (${MK_META_MODE} == "yes")
> make: Fatal errors encountered -- cannot continue
> make: stopped in /builds/FreeBSD_HEAD
> Build
Garrett Cooper wrote:
> Breaking source upgrades to later versions is painful. We want to make
> sure fmake at least works with upgrade_checks so people can upgrade
> from earlier versions of 8/9/10 to 11 without having to deal with a
> lot of pain.
I agree but 8 -> 11 is a very big jump.
__
Dimitry Andric wrote:
> Some questions about this commit, which I'm sure more people must have:
Sure, good questions and as you say, many likely thinking the same.
> * Was it really necessary to commit hundreds of clearly generated files?
Short answer is "yes" - since they are actually what mak
Adrian Chadd wrote:
> Wait a second - y'all committed a bunch of dependencies that we aren't
> supposed to edit directly?
Yes ;-)
If building using the normal buildworld etc you can ignore them.
> So what's the process for making sure we don't stomp over the feet of
> other people who are using
Dimitry Andric wrote:
> > head/usr.bin/kdump/Makefile
>
> Is this supposed to fix things? Even at r284381, I get:
I did for me ...
>
> ===> usr.bin/kdump (depend)
> sh /usr/src/usr.bin/kdump/mksubr /usr/obj/usr/src/tmp/usr/include
> >kdump_subr.c
> env MACHINE=i386 CPP="cpp " sh /usr/src/u
Adrian Chadd wrote:
> I'm happy for this to be your baby and see how it all pans out in the
> tree, but I thought we as a project learnt some lessons about checking
> in autogenerated files.
Sorry I don't have the history on that, but I thought it had been made
clear for 4 years now that this was
Craig Rodrigues wrote:
Thanks Craig,
> (2) In the long run, having better documentation, tooling and procedures to
> update the
> Makefile.depend files will be definitely needed.
The only thing needed to update them is a successful build (in meta
mode), it is so painless that many d
Craig Rodrigues wrote:
> I got the same errors here:
>
> https://jenkins.freebsd.org/job/FreeBSD_HEAD/2869/consoleFull
Looks like you fixed it - thanks
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To un
Julian Elischer wrote:
> As long as there is a REALLY EASY WAY to regenerate them and it's well
> documented,
Building each directory (in meta mode) is all that is/should be needed.
> EXACTLY the same output
> each time unless there is a source change, (so svn doesn't see a
> change if there is
Julian Elischer wrote:
> I think a make MAKE_MAKEFILE_DEPENDS=1 (build)world is an important step
> requirement..
You can do 'make buildwork -DWITH_META_FILES' and it will produce meta
files - they can be very handy for debugging issues - like headers
comming from places you didn't expect.
My or
Oliver Pinter wrote:
> On 6/15/15, Simon J. Gerraty wrote:
> > Garrett Cooper wrote:
> >
> >> Breaking source upgrades to later versions is painful. We want to make
> >> sure fmake at least works with upgrade_checks so people can upgrade
> >> fro
Oliver Pinter wrote:
> >> * Or are you now the maintainer of these .depend files? :-)
> >
> > For now, yes.
> > I think that's the only reasonable approach at this early stage.
>
> Cool! What is you github account? I like to add your access to our
> repo, and please fix this issue:
> http://jenki
Garrett Cooper wrote:
> > These files need to be generated before mkdep is run.
>
> This is wrong (I’ve had to fix a lot of this at $work recently). They
> need to be added to DPSRCS so they will always be regenerated as a
> dependency of DPADD.
Not in this case. These things are never compiled
Author: sjg
Date: Mon Jun 15 18:43:32 2015
New Revision: 284419
URL: https://svnweb.freebsd.org/changeset/base/284419
Log:
Don't use ${.OBJDIR}/ to qualify target that isn't specified that way
Modified:
head/sys/conf/kmod.mk
Modified: head/sys/conf/kmod.mk
===
Author: sjg
Date: Mon Jun 15 19:23:47 2015
New Revision: 284420
URL: https://svnweb.freebsd.org/changeset/base/284420
Log:
do not include src.opts.mk from here
Modified:
head/share/mk/local.init.mk
Modified: head/share/mk/local.init.mk
Author: sjg
Date: Mon Jun 15 20:11:15 2015
New Revision: 284424
URL: https://svnweb.freebsd.org/changeset/base/284424
Log:
Pay attention to MK_ELFTOOLCHAIN_TOOLS so we build the desired tools.
Added:
head/lib/libelftc/Makefile.depend (contents, props changed)
head/usr.bin/elfcopy/Makefile
Author: sjg
Date: Mon Jun 15 21:09:18 2015
New Revision: 284430
URL: https://svnweb.freebsd.org/changeset/base/284430
Log:
Skip MAKE_PRINT_VAR_ON_ERROR unless we are doing META_MODE
with all the recursion in normal build it is too much noise.
Modified:
head/share/mk/local.sys.mk
Modified:
Author: sjg
Date: Mon Jun 15 22:04:29 2015
New Revision: 284433
URL: https://svnweb.freebsd.org/changeset/base/284433
Log:
Remove extra blank lines
Modified:
head/usr.bin/xlint/llib/Makefile
Modified: head/usr.bin/xlint/llib/Makefile
==
Author: sjg
Date: Tue Jun 16 23:03:15 2015
New Revision: 284477
URL: https://svnweb.freebsd.org/changeset/base/284477
Log:
Bump the version since we now handle openat
Modified:
head/sys/dev/filemon/filemon.h
Modified: head/sys/dev/filemon/filemon.h
===
Author: sjg
Date: Tue Jun 16 23:06:43 2015
New Revision: 284478
URL: https://svnweb.freebsd.org/changeset/base/284478
Log:
Normally a staging conflict causes an error.
When bootstrapping different options, it is handy to be able to
make those warnings.
Modified:
head/share/mk/meta.stage.m
Author: sjg
Date: Tue Jun 16 23:32:28 2015
New Revision: 284479
URL: https://svnweb.freebsd.org/changeset/base/284479
Log:
Make mention of make.conf being included earlier and what to do about it.
Reviewed by: NGie
Modified:
head/UPDATING
Modified: head/UPDATING
===
Author: sjg
Date: Tue Jun 16 23:36:20 2015
New Revision: 284480
URL: https://svnweb.freebsd.org/changeset/base/284480
Log:
Hook extra libs to _LIBS so bsd.lib.mk can do its thing
Differential Revision:D2843
Reviewed by: imp
Modified:
head/gnu/lib/libgcc/Makefile
Modified: hea
Author: sjg
Date: Tue Jun 16 23:37:19 2015
New Revision: 284481
URL: https://svnweb.freebsd.org/changeset/base/284481
Log:
new depends
Added:
head/lib/clang/liblldb/Makefile.depend (contents, props changed)
head/lib/clang/liblldbAPI/Makefile.depend (contents, props changed)
head/lib/c
Author: sjg
Date: Tue Jun 16 23:38:44 2015
New Revision: 284482
URL: https://svnweb.freebsd.org/changeset/base/284482
Log:
Support WITH_LLDB
Remove entries from userland/gnu that conflict with toolchain
Modified:
head/targets/pseudo/clang/Makefile.depend
head/targets/pseudo/toolchain/M
Ian Lepore wrote:
> > I agree but 8 -> 11 is a very big jump.
>
> Not really. We're in the midst of such a change at $work, but it will
Yes we still use 7.x on most machines - these can build head just fine,
but it is a reasonably controlled environment, with minimal
dependence on the host env.
Author: sjg
Date: Fri Jun 19 14:56:24 2015
New Revision: 284598
URL: https://svnweb.freebsd.org/changeset/base/284598
Log:
Move include of make.conf back to its old position.
This means moving include of local.sys.mk and src.sys.mk too.
Introduce new includes to take the early slot, for t
301 - 400 of 496 matches
Mail list logo
