Commit Graph

1442 Commits

Author SHA1 Message Date
espie
c1c992e6a5 dump-vars should show VMEM_WARNING 2012-04-22 10:39:48 +00:00
espie
390cba80df handle modbuild (perl module) stuff similarly to what gnu does.
there's no actual reason not to do it.
2012-04-17 09:31:47 +00:00
espie
b411a2917d strip PORTSDIR (or equivalent) from DESCR the same way we compute PKGPATH.
avoids random changes of INDEX depending on where the ports tree is installed
and configured.
2012-04-16 09:21:39 +00:00
landry
fd5a44dd70 Oops, unbreak by providing an empty GCC3_ARCHS. 2012-04-12 15:06:05 +00:00
landry
3cd365fcdd Move sh/landisk to GCC4_ARCHS.
ok phessler@ naddy@
2012-04-12 11:46:35 +00:00
espie
f456512a27 error out if PORTSDIR is not set to the real directory.
There are at least two or three ports that don't like symlinks. ;/
2012-03-22 14:08:50 +00:00
espie
aa4fe831d9 give FULLPKGPATH in warning message. Redundant, but may be useful for multi. 2012-02-23 08:32:17 +00:00
espie
25362a8808 prevent top-subdirs from ignoring flavor and subpackage markers 2012-02-17 07:41:22 +00:00
espie
958fa76f4d kill fetch-makefile here too 2012-02-17 07:40:35 +00:00
espie
bf99288338 scrap old fetch targets
add a warning when LIB_DEPENDS doesn't register (for sthen@)
tweak FLAVOR message for consistency
2012-02-17 07:33:04 +00:00
espie
baeec434e0 PKGFILES, why not ? 2012-01-29 11:29:51 +00:00
espie
16fd5981f1 now that update sees all pkgpaths, we can still remove duplicates. 2012-01-28 08:39:40 +00:00
espie
26b5c343e3 remove that check for now, something in pkg_create chain is not sanitizing
its environment...
2012-01-21 19:07:20 +00:00
espie
9971f34ba5 prevent some errors I've run into recently
- add ERRORS framework to bsd.port.subdir.mk
- trying to add a FLAVOR or a SUBPACKAGE to an intermediate SUBDIR is an
error (see editors/vim-spell,af recently)
- re-including bsd.port.mk/bsd.port.subdir.mk after either of them is an
error (can happen when one moves stuff to Makefile.inc without really thinking
about it, ends up with PKG_ARGS holding some contents twice and make package
erroring out with duplicate contents)
2012-01-21 14:44:40 +00:00
espie
0739a30939 pass PERMIT_DISTFILES* to dpb fetch 2012-01-14 12:22:07 +00:00
espie
2fe091cc70 recognize pkgpath changes when updating 2012-01-14 12:21:13 +00:00
miod
95cad4b2a7 In MAKE_ENV, quote PICFLAG as it may contain spaces. Other variables might
require similar quoting in the future, but so far this is enough to repair
port building operation on m68k.
ok espie@
2011-12-21 05:16:04 +00:00
robert
21e0488094 Add support for MODGCC4_VERSION which can be used to define which gcc
version to use with the gcc4 module.
It defaults to 4.2, so there is no functional change.
2011-12-14 18:20:12 +00:00
espie
4cab976e61 zap old junk 2011-12-12 14:52:02 +00:00
jasper
cbd2f0c9f4 add a fragment to prevent picking up gnu awk by accident.
tested in a bulk build by me

  ok espie@
2011-12-12 10:33:33 +00:00
espie
0603716dc7 - tweak CONFIG_SITE_LIST to run under infra/db.
- recognize absence of dependencies on gsed, gtar, ggrep,
and prevent more tests from seeing these.
2011-12-10 11:15:16 +00:00
espie
949fe672d3 make it possible to assemble a CONFIG_SITE instead of having one
single file.
approved by aja@, sthen@, jasper@...
2011-12-09 09:42:44 +00:00
espie
ab6b512da4 move the architecture *constants* to a private arch-defines.mk file
That way, bsd.port.arch.mk can still make available in a Makefile, but
we can also include them early in bsd.port.mk, so that they will always
be available from modules and Makefile.inc.
2011-12-08 08:15:36 +00:00
espie
1c7aab78c9 sort -u requires one parameter to not hang on stdin...
allow SUBDIR=archivers/arc make show-prepare-results to work
2011-12-02 15:14:20 +00:00
naddy
4742472cb6 alpha uses gcc4 now, and so does hppa64 2011-11-29 15:11:18 +00:00
sthen
e7fe871f2c replace "!defined(MASTER_SITE_OVERRIDE)" check for MASTER_SITES[0..9] with the
new ${MASTER_SITE_OVERRIDE:L} == "no" construct, problem reported by naddy@.
2011-11-27 21:04:34 +00:00
espie
03d1bfec7f generate a tempfile, THEN move to saved_libs if things are okay 2011-11-27 17:21:44 +00:00
espie
51892d0631 explicitly ask for stdin 2011-11-27 16:52:04 +00:00
jasper
d435bb4bc0 whitespace nit 2011-11-27 14:59:21 +00:00
jasper
953ca5dbf2 move to bin/ and ajust CPANTEST path
ok espie@
2011-11-27 13:29:35 +00:00
espie
a3733c98dd for :patch ports, show-prepare-results should also include the list of
installed dependent ports, so we have no choice but ask, which is fairly
easy to do.
2011-11-26 13:52:52 +00:00
espie
ed8b3e60fa a few more notes 2011-11-25 15:05:56 +00:00
espie
03b76c3a13 - tweak "prepare" stage to give more accurate default/dependency result directly
code should still work with older pkg_info, but you need uptodate pkg_info
for best messages, e.g.,:
===> kdelibs-3.5.10p14 depends on: gettext->=0.10.38 -> gettext-0.18.1p0
===> kdelibs-3.5.10p14 depends on: metaauto-* -> metaauto-1.0
===> kdelibs-3.5.10p14 depends on: autoconf-2.61 -> autoconf-2.61p3
===> kdelibs-3.5.10p14 depends on: gmake-* -> gmake-3.82

- adds target: show-prepare-results that yields the list of installed packages
deduced by prepare

- kill undocumented CLEAN_PLIST_OUTPUT
- remove old internals
- ensure IS_INTERACTIVE and REGRESS_IS_INTERACTIVE are always defined
- fix a bug in FETCH_MANUALLY and BATCH interaction
2011-11-25 13:58:13 +00:00
espie
636426623c grmf, managed to reintroduce two PKG_DBLOCK 2011-11-24 19:24:54 +00:00
espie
ff9908d97d bug-fix, behavior for dependency check with "_DEPENDS_TARGET=package" is
disturbingly complicated (as reported by aja@, naddy@, and others. Sorry,
was looking at the wrong code, so I didn't see the bug)
2011-11-24 18:12:28 +00:00
espie
752bf17c1c zap/protect some stuff.
keep FTP_KEEP_ALIVE for now, until we sort it out.
2011-11-24 17:49:58 +00:00
jasper
a102f0ce98 whitespaces 2011-11-21 17:13:32 +00:00
espie
2522fc337e minor tweaks 2011-11-21 16:43:52 +00:00
espie
825f591fa4 BASESYSCONFDIR points to /etc (global user settings), and SYSCONFDIR
is derived from it.
old march discussion, prodded by fgs@ about it.
2011-11-21 16:42:52 +00:00
espie
0ed05101b4 nicer less confusing messages 2011-11-21 12:26:05 +00:00
espie
f5458c8a3e better check for PREPARE_CHECK_ONLY: assume we're second_pass already in
the check_install case.
That way, we get the full error report.
2011-11-21 12:20:53 +00:00
espie
eba34186b3 Speed up prepare stage: simplify the old loop, remove old cruft.
In the case where we want an install, run one single pkg_info instead of two.
If this fails during the second pass, we will run it again to figure out
whether the install or the default is wrong, but this is an error condition,
so this need not slow down the general case.

Add PREPARE_CHECK_ONLY knob, to be used by dpb: dpb already installs what
it needs, so for install dependencies to be missing during the "prepare"
stage is an error in dpb's logic...
2011-11-21 12:16:42 +00:00
espie
55ef3a8806 dpb refuses multiple subpackages in a pkgpath, there's no reason for
pkgpath.mk to do otherwise.
2011-11-20 15:38:08 +00:00
espie
2f85417164 document partly how dependency internals work 2011-11-19 16:35:46 +00:00
espie
dce00fcc63 more dire warning about abusing internal _* shit. 2011-11-19 15:07:31 +00:00
espie
65096ef4f0 document fragments related to dependency parsing 2011-11-19 14:59:27 +00:00
espie
8663ec5dfb set conventions, document locking internals 2011-11-19 14:35:56 +00:00
espie
7873819719 more flesh 2011-11-19 14:17:59 +00:00
espie
478a792605 first pass at documenting stuff for very curious people, more to come 2011-11-19 13:37:41 +00:00
espie
3aa1b0516a unzap the ECHO_MSG 2011-11-19 11:43:05 +00:00
espie
2334188bc1 oh, hum... use TMPDIR instead of hardcoding it. 2011-11-19 11:36:53 +00:00
espie
cb960e35d0 mv _cache_fragment to pkgpath.mk
create a new category of recursive targets that can use this fragment,
and use them, e.g., print-package-signature from top-level should benefit
a lot.
2011-11-19 11:33:39 +00:00
espie
4c9d60034c do the no_mips64 dance here, no need to duplicate it in lots of Makefiles 2011-11-18 11:01:47 +00:00
espie
e8b4473500 setting PKGPATH in pkgpath.mk is not enough, pass it thru the environment
as appropriate.

(typical make package would call getpkgpath 15 times instead of 1!)
2011-11-17 17:53:22 +00:00
espie
1dcb17d4da try to avoid SUDO while cleaning up the cache.
this avoids prompting for password during make extract.
problem noticed by rpointel@
2011-11-16 14:40:59 +00:00
espie
3b4f419753 add comments to a few thing
be more precise into recreating $d, using bizarre shell patterns
2011-11-16 10:57:23 +00:00
espie
07da0fb496 flatten the DEPENDS_CACHE structure, at the expense of one extra sed.
avoids problems with ownership of various directories, as seen by naddy@
2011-11-16 10:30:47 +00:00
espie
450f2ff1ca rephrase to remove unneeded needed variable. 2011-11-15 20:41:41 +00:00
espie
645b599225 same code 2011-11-15 20:32:35 +00:00
espie
2517b318eb speed-up dependency checking a bit:
- resolve-lib -needed, less perl invocations (gains a lot)
- show-run-depends, less fancy than run-dir-depends, a bit faster...
- don't create cache for internal targets (external stuff already did it)

define _PERLSCRIPT in pkgpath.mk since getpkgpath should use it...
2011-11-15 20:08:36 +00:00
espie
7021d5e8f9 rework the dependency code to be slightly simpler.
systematically use a cache while scanning for libraries.
This speeds up MULTI_PACKAGES a bit...
2011-11-14 22:02:15 +00:00
espie
982d021ed2 we have :QL, so make depends handling a bit saner. 2011-11-14 16:18:36 +00:00
espie
2be274b94e IFS setting can be local to the read 2011-11-14 13:12:20 +00:00
espie
ff5f349783 nit pick some very old stuff 2011-11-14 12:10:27 +00:00
espie
520b395530 a bit more micro-optimization: allow print-plist-libs-with-depends 2011-11-14 10:29:58 +00:00
espie
2ab4b2c7e7 better FETCH_MANUALLY handling:
- expose MISSING_FILES
- treat them as a special kind of IGNORE
- handle that in DPB
that way, ports that are IGNORE'd for other reasons (not correct arch)
stay ignored, and relevant ports with missing distfiles get better error
messages
2011-11-13 10:34:35 +00:00
espie
0bf789a9ca work around brain damage 2011-11-07 15:39:50 +00:00
espie
bc958fd5b8 revert until I figure out why emacs21 is unhappy with this ? 2011-11-07 14:23:09 +00:00
espie
1e4f1a9788 pass CONFIG_SITE to build step as well. should make lang/gcc build
marginally faster, and a few other odd ports that reconfigure during build
as well...
2011-11-06 12:38:29 +00:00
avsm
8442300dd1 add .tbz to the list of known EXTRACT_SUFX entries
ok espie@ brad@ dcoppa@
2011-11-02 17:16:30 +00:00
espie
f517149f57 make signatures conform to the way packages get built.
This does slow down signature computations (I will try to address that),
but it removes all false positives from dpb -R.

tested by nigel@
2011-10-25 15:08:10 +00:00
espie
3e80882e17 zap pre,do,post fetch & package.
speed up print-plist-libs a wee little bit
2011-10-24 12:34:08 +00:00
matthieu
7cdaa27aff Modernize error message. Don't tell people to use a 11 years old
ports tree. ok naddy@, espie@.
2011-10-23 22:06:01 +00:00
espie
26cf943632 missed one (Nathanael Rensen <nathanael@polymorpheus.com>) 2011-10-22 07:42:24 +00:00
espie
4512fd2e97 missed one 2011-10-21 16:52:05 +00:00
espie
d6c20248ec zap CHOWN/CHMOD, as prompted by a question from stu 2011-10-21 16:35:14 +00:00
espie
af01b50822 prepare framework to avoid pseudo-flavors from dpb unless in bootstrap
situation
2011-10-18 06:43:51 +00:00
espie
cbf9cefc78 pull in elf toolchain along with other properties 2011-10-16 07:52:08 +00:00
espie
490e1cfa18 minor cleanup: there's no reason for these variables to be intermixed
with targets.
lib-depends-check should be defined as ignored along with the rest.
errors-handling should occur last, so that the last block of errors gets
used.
2011-10-16 07:51:27 +00:00
espie
6b8ccf58db - fix position of Makefile.inc include guard to allow arbitrary intermixing of
Makefile.inc and bsd.port.arch.mk without infinite recursion.

- use simpler pattern to test for arch stuff, we just need the values, so
.for A B in ${MACHINE_ARCH} ${ARCH}
is enough and avoids the setting of intermediate variables.

- new PROPERTIES variable that's easy to test with e.g. if ${PROPERTIES:Mapm}
2011-10-16 07:12:35 +00:00
espie
398f738da8 There's no actual reason to accept flavors with non-lowercase spelling,
so kill the misfeature, as agreed by mostly everyone.
2011-10-03 15:46:33 +00:00
jasper
3c6680c24e Remove some duplicate code by putting in a variable, as done elsewhere. 2011-10-03 14:21:02 +00:00
espie
f9a48d816a pseudo-flavors *must* be taken off MULTI_PACKAGES, not BUILD_PACKAGES.
dpb coalesces build dependencies over MULTI_PACKAGES: if we don't substract
from MULTI_PACKAGES, this can lead to bootstrap loops.

Case in point: sysutils/gamin, whose build relies on "no_server" to be
available as a dependency for glib2/gtk+2.

(but IGNORED stuff is properly kept as MULTI_PACKAGES, since it's mostly
intended to avoid strange arch errors)
2011-10-03 08:35:36 +00:00
espie
00d241e48d oops 2011-09-30 05:35:52 +00:00
espie
6cd8498bb2 MONO_ARCHS to de-dup the tree
ok robert@, aja@
2011-09-28 13:54:20 +00:00
espie
c3afd6ab0d more default flavors cleanup:
- if there is no flavor in BUILD_PKGPATH, it's not necessarily the default,
make sure there's an empty flavor by appending a ,
- pass FLAVOR to dump-vars, so that eventually dpb can match "no flavor
specified" to "this is the default flavor", thus getting a bit smarter
(this should speed up the LISTING job by not traversing as many subdirs).
2011-09-28 10:20:19 +00:00
espie
38dc23d0a7 cosmetic: don't repeat ourselves for NOT_FOR_ARCHS. 2011-09-28 10:03:09 +00:00
naddy
0b78f2cdd8 use ${TAR} when extracting .tar.xz, too 2011-09-25 21:30:04 +00:00
espie
1c7ee6e474 regroup everything having to do with MD stuff and split it off into
its own file.

*this requires current src as well*, to have the glue in /usr/share/mk
2011-09-25 07:59:49 +00:00
espie
a08bf6b41e tweak the flavor_fragment stuff to be able to specify "hey, if there's no
flavor, it means it's empty and not the default one". Useful for tools
that reuse saved fullpkgpaths.
2011-09-24 07:36:02 +00:00
espie
a647125932 kill some very old knobs we do not use at all.
okay ETOOMANYPEOPLE
2011-09-21 09:02:09 +00:00
sthen
cff74bb849 no need to warn about xz for SHARED_ONLY ports, they don't work on vax anyway.
ok espie@
2011-09-20 09:36:13 +00:00
kili
a0f936ee32 Temporarily disable globbing in _compute_default, to fix
all kind of weird shit happening (welcome to quoting hell).

Problem noticed first by jasper, globbing fix suggested by
espie.

ok espie
2011-09-16 20:02:20 +00:00
espie
6011c3d2f0 normalize pkgpath in bsd.port.mk 2011-09-16 08:26:09 +00:00
espie
2175cc022f tweak dependency handling: use set -- make _print-metadata to get
all properties of the depending port we want.
2011-09-15 17:19:36 +00:00
espie
609a67413a better: define PSEUDO_FLAVOR as something to add to the fullpkgpath 2011-09-10 08:20:56 +00:00
espie
63dce684dc show FLAVOR to dump-vars.
This is occasionally useful for pseudo-flavors: these do not get encoded
in the pkgpath, so taking (for instance) sqlports, this generates lines
which are later impossible to exploit based only on the fullpkgpath, as
opposed to fullpkgpath,flavor  (which might contain the flavor twice, but
this is not an issue).
2011-09-10 08:05:12 +00:00
espie
312cba7ce7 name construct as OLD_WRKDIR_NAME, to be used as WRKDIR_LINKNAME 2011-09-03 13:39:56 +00:00
sthen
ad0415194d Check NO_CCACHE everywhere that USE_CCACHE is checked, I missed it in
one small but necessary place.
2011-07-20 08:46:20 +00:00
fgsch
7c3864da84 add regress-depends-list.
input and ok espie@.
2011-07-15 23:11:00 +00:00