Commit graph

248 commits

Author SHA1 Message Date
rillig
19b0bb4391 bootstrap: don't output "Hopefully" when bootstrap finishes
The pkgsrc bootstrap has been used long enough to be more
self-confident.
2018-03-07 07:34:07 +00:00
bsiegert
dd09a279d9 Remove a mis-pasted line. Noticed by jperkin@. 2018-02-03 09:53:03 +00:00
bsiegert
1ad3e0227c Use pkgsrc awk on ChromeOS.
Since Chrome 64, /usr/bin/awk has been a version of mawk that is permanently
in restricted mode. Notably, this means it cannot run pipes, which pkgsrc
requires. Use nawk.
2018-02-02 15:53:44 +00:00
sevan
956f0a6f65 Define machine_arch for Cygwin, this resolves an issue where MACHINE_ARCH is set
to blank & configure substituation breaks because host type identifier is
complete.
-pc-cygwin, rather than x86_64-pc-cygwin.
2017-12-09 00:33:36 +00:00
bsiegert
22c455105d Set cwrappers in bootstrap mk.conf too.
When bootstrap is run with --cwrappers=no (or yes, for that matter),
the value is written into mk.conf at the end of the bootstrap but not
used _during_ the bootstrap itself. Thus, when bootstrapping on Linux
with no builtin diffutils, cwrappers ends up indirectly depending on
itself, and there is no way around that. This commit fixes this.
2017-10-22 19:29:20 +00:00
maya
5e144002c5 macOS 10.13 requires nbsed and nbawk
From Eric Brown in PR pkg/52566
2017-09-23 05:43:51 +00:00
maya
dbff74fd54 Add code for finding machine_arch on OSF1
From Naruaki Etomi in PR pkg/52311
2017-06-19 06:30:48 +00:00
khorben
ef481a5e81 Allow bootstrapping without cwrappers
Since cwrappers was enabled by default on some platforms, it became
effectively impossible to bootstrap without cwrappers there.

With this change "--cwrappers" needs to be set to "auto", "yes" or "no"
explicitly when used.

No functional change intended without specifying "--cwrappers" (or with
"auto").

Submitted on tech-pkg@ with no objection.
2017-04-29 21:40:40 +00:00
tron
284d8c8b5c As macOS Sierra still ships with a broken "awk" and "sed" use the
pkgsrc variants as we do under Mac OS X El Capitan.
2017-02-11 16:08:31 +00:00
jperkin
320f4325bb Simplify and optimise previous. 2017-02-01 10:14:09 +00:00
sevan
89bfc37b33 For POWER8 systems running Linux, set $machine_arch to powerpc64le if machine
hardware name is ppc64le.
Automatically default to 64bit ABI for powerpc64le systems.
2017-02-01 09:54:21 +00:00
jperkin
e5ce097b03 Test for existing $prefix and $pkgdbdir and bail out early if they exist,
rather than failing with exotic errors later.
2017-01-10 12:30:00 +00:00
jperkin
0bd8813cb1 Use die() 2017-01-10 12:16:08 +00:00
jperkin
5067dbcc65 Pass --without-lz4 to libarchive bootstrap, avoids issues on Gentoo where
the native lz4 is found.
2017-01-03 17:53:14 +00:00
jperkin
14882b76b8 Change the default PKG_DBDIR to be ${LOCALBASE}/pkgdb. Resolves issues on
other BSDs which already use /var/db/pkg for the native package manager.
2016-11-15 11:19:09 +00:00
jperkin
b29215dde2 When building cwrappers via bootstrap, either directly via --cwrappers or
indirectly via it being pulled in using USE_CWRAPPERS=auto, we need to
ensure that it is not built with -DPKG_PRESERVE as otherwise it interacts
badly with pbulk's pkg_delete test.
2016-11-01 20:44:22 +00:00
joerg
1bcdb13b35 Disable maintainer mode for the right tool. 2016-06-22 11:40:16 +00:00
joerg
ceb082dd63 Disable maintainer mode here as well. 2016-06-22 08:07:11 +00:00
joerg
4daa7a37d3 No need to set USE_DESTDIR now. 2016-04-10 16:18:45 +00:00
jperkin
0fb5b70487 Fix --quiet. The output is far from quiet, but at least it now works. 2016-02-08 14:53:43 +00:00
jperkin
0d727d5415 Fix PowerPC 32-bit case. 2016-02-04 13:45:24 +00:00
jperkin
ac56158090 Attempt to bring sanity to how ABI and MACHINE_ARCH are set.
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.
2016-01-24 16:14:44 +00:00
jperkin
e79c2d4835 Ensure we set MACHINE_ARCH correctly for Darwin x86_64. Fixes recent
bootstrap issues.
2016-01-06 17:59:58 +00:00
joerg
cd5c4d5cd3 Tell libarchive's configure explicitly what make we later want for
recursive invocations.
2015-12-29 21:13:57 +00:00
joerg
63f9c9b7cc Include basic package creation logic in the bootstrap version of
pkg_install. Use this with PKG_COMPRESSION=none to convert all of the
bootstrap to USE_DESTDIR=yes.
2015-12-27 12:36:42 +00:00
jperkin
9c7c89b590 Build nbawk and nbsed on Darwin 10.11 (El Capitan) too, it still has the sed
which fails when using a UTF-8 locale.  Ok'd during the freeze by wiz@
2015-12-18 13:49:07 +00:00
joerg
e1b28148a5 Match MACHINE_ARCH override used in bsd.prefs.mk on FreeBSD and
DragonFly.
2015-12-11 23:55:44 +00:00
jperkin
b5d86f4cf5 Default to ABI=64 on Darwin hosts which report as x86_64. 2015-11-09 10:54:44 +00:00
sevan
f5a273fb71 For Bitrig
Switch to using arch(1) to detect the architecture of host
Set $machine_arch to x86_64 if on amd64
Pass $machine_arch to the devel/bmake build process

Reviewed by wiz@
2015-11-07 19:55:46 +00:00
sevan
d26f69914c Use arch(1) to detect the architecture of host
Switch $machine_arch to x86_64 if on OpenBSD/amd64
Pass $machine_arch to the devel/bmake build process

Reviewed by wiz@
2015-11-07 14:05:20 +00:00
tron
619b1bd74a If "/usr/bin/bash" is installed under Solaris always prefer it over the
"pdksh" package. Using the package is too problematic, see PR pkg/39524.
2015-06-13 13:15:39 +00:00
sevan
8514571a7a Introduce preliminary support for Bitrig to pkgsrc
Initial patchset to add support by rodent@
Further adjustments made based on feedback by joerg@
Tested by myself with numerous bulkbuilds thanks to Patrick Wildt @ Bitrig

Reviewed by bsiegert@ joerg@ wiz@
2015-06-04 15:48:45 +00:00
sevan
4e8a0fc564 Use pdksh when bootstrapping on AIX, while it's possible to bootstrap
successfully using the stock /bin/sh supplied with the system, things don't work
correctly.

Reviewed by wiz@
2015-05-03 14:26:57 +00:00
jperkin
9bf4d06492 Don't build the cwrappers package during bootstrap, it is pulled in
as a build dependency as needed.
2014-12-04 10:36:02 +00:00
jperkin
eb5184f07c Add a "--cwrappers" option to build and enable cwrappers. 2014-12-01 13:43:55 +00:00
jperkin
9b3f758131 Add support for --make-jobs, which passes down -j or MAKE_JOBS as
appropriate.  The default continues to be 1.
2014-09-01 12:29:58 +00:00
cheusov
eec1402772 Fix packages creation on Interix.
User/group names are used instead of uid/gid.
  Problem with spaces inside user/group name should be fixed by Cygwin
  support added some time ago.
2014-08-14 00:21:24 +00:00
schmonz
3898d50233 Need nbsed on Yosemite (not sure about awk, but little harm). 2014-08-01 15:01:16 +00:00
schmonz
8a0b90762f Detecting clang on OS X is stymied in some configurations by "gcc"
looking sufficiently like gcc. Inspect "cc" instead, and don't
believe it's __GNUC__ unless it's also not __clang__.

While here, if you manage to find and install PackageMaker.app, it
still works on 10.9 for --binary-macpkg.

From Sevan Janiyan.
2014-07-30 16:30:26 +00:00
jperkin
9e9ad92b64 Use check_compiler=yes on Darwin, fixes bootstrap with newer XCode that
includes gcc which is actually clang.
2014-07-11 17:29:21 +00:00
asau
b673262e2f Amend previous: pick built bmake binary from correct directory. 2014-04-17 18:29:01 +00:00
asau
f335584ed6 Follow the conventional path of "configure-make-install"
when bootstrapping bmake.
2014-04-17 18:27:24 +00:00
asau
44162d0641 The only use of "bmakexenv" variable is on IRIX to pass MAKE=pmake
to devel/bmake when bootstrapping the latter.
bmake doesn't take this environment variable into consideration anyway.
2014-04-17 18:12:47 +00:00
obache
545c8428c8 Set CLANGBASE=/usr automatically if CLANGBASE is not set and /usr/bin/clang exists.
It is expected in mk/compiler/clang.mk that CLANGBASE is set properly
even if builtin clang is selected.
2014-04-03 09:05:11 +00:00
ryoon
d0f71acda6 Add Xinuos SCO OpenServer 5.0.7/3.2 support
The license donation for OpenServer 5.0.7/3.2 by Xinuos Inc. helped to
make this commit possible.
2014-03-14 21:52:13 +00:00
asau
5cca1eda52 Detect Clang and apply proper compiler settings.
This fixes bootstrapping on FreeBSD 10 where cc is Clang
pretending poorly to be GCC.
2014-03-10 20:50:35 +00:00
jperkin
88099c9cc6 Add bootstrap support for multiarch support on Linux. For now only
building 32-bit packages on x86_64 is supported.
2014-03-07 14:59:42 +00:00
ryoon
f44b8ee992 Fix usage of build_package 2014-02-10 10:43:02 +00:00
joerg
15534d87f5 Mark the copy of bmake's configure as executable in case the checkout is
missing the bit.
2013-10-03 01:24:57 +00:00
ryoon
01967278e4 Add FreeMiNT settings. 2013-09-08 16:29:28 +00:00