Previously there were at least 5 different ways MACHINE_ARCH could be set,
some statically and some at run time, and in many cases these settings
differed, leading to issues at pkg_add time where there was conflict
between the setting encoded into the package and that used by pkg_install.
Instead, move to a single source of truth where the correct value based on
the host and the chosen (or default) ABI is determined in the bootstrap
script. The value can still be overridden in mk.conf if necessary, e.g.
for cross-compiling.
ABI is now set by default and if unset a default is calculated based on
MACHINE_ARCH. This fixes some OS, e.g. Linux, where the wrong default was
previously chosen.
As a result of the refactoring there is no need for LOWER_ARCH, with
references to it replaced by MACHINE_ARCH. SPARC_TARGET_ARCH is also
removed.
"/bin/sh: There is no process to read data written to a pipe." is logged using
system supplied shell during the scan stage of a bulkbuildi otherwise.
Reviewed by wiz@
expect full path names. Use the default locations in /bin unless
overriden explicitly. Bump revision of bmake.
On Solaris, use /usr/xpg4/bin/sh if it exists.
use inplace libnbcompat like the direct build from bootstrap
does. Fix a long-standing bug in mkbinarykit. The default work
directory was "work" (relative) and therefore MAKECONF=work/...
was passed down, effectively making it a nop. That resulted in
digest being incorrectly installed during the bootstrap.
Tested on DragonFly by myself and on OSF by tnn@, discussed with jlam@
Including e.g. /usr/share/mk results in sys.mk read from there
as well. On DragonFly this adds X11BASE and results in obscure
breakages. Since the mk files are supposed to be self-contained,
it doesn't make much sense to look in other directories anyway.
Bump revision to annotate this.
Discussed-with: reed@.
Reported-by: Aggelos Economopoulos <aoiko AT cc DOT ece DOT ntua DOT gr>
Remove GNU_CONFIGURE=no from pkgsrc Makefile.
Add "--mksrc none" to arguments and
add --prefix=${PREFIX} and --sysconfdir=${PKG_SYSCONFDIR}
and remove ${CONFIGURE_ARGS} for boot-strap.
Note that I didn't import the files that only change was a
CVS $Id$ tag.
From ChangeLog:
2005-11-05 Simon J. Gerraty <sjg@void.crufty.net>
* Makefile.in (BMAKE_VERSION): bump to 20051105
* configure.in: always set default_sys_path
default is ${prefix}/share/mk
- remove prefix_sys_path, anyone wanting more than above
needs to set it manually.
2005-11-04 Simon J. Gerraty <sjg@void.crufty.net>
* boot-strap: make this a bit easier for pkgsrc folk.
bootstrap still fails on IRIX64 since MACHINE_ARCH gets set to
'mips' while pkgsrc wants 'mipseb' or 'mipsel'
2005-11-02 Simon J. Gerraty <sjg@void.crufty.net>
* Makefile.in (BMAKE_VERSION): bump to 20051102
* job.c (JobFinish): fix likely ancient merge lossage
fix from Todd Vierling.
* boot-strap (srcdir): allow setting mksrc=none
2005-10-31 Simon J. Gerraty <sjg@void.crufty.net>
* Makefile.in (BMAKE_VERSION): bump to 20051031
* ranlib.h: skip on OSF too.
(NetBSD PR 31864)
The plan is to remove the out-of-date source from bootstrap/bmake.
Sources obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/.
Source is kept in files/ for bootstrap purposes (to be done).
Update to version bmake-20051002. Changes include:
* Makefile.in (BMAKE_VERSION): bump to 20051001
support for UnixWare and some other systems,
based on patches from pkgsrc/bootstrap
Remove DEPENDS for mk-files (as mentioned on tech-pkg in June).
Use libnbcompat. Also patch-aa is to use libnbcompat.
(I chose to use patches so files would be exact from original source
tarball.)
And use PKGMANDIR.
