Commit graph

160 commits

Author SHA1 Message Date
tv
e80e896df4 PKGDIRMODE must be set *after* including defs.*. 2004-04-26 17:29:33 +00:00
tv
88a6915436 Make sure PKGDIRMODE is always set in bsd.prefs.mk so it can be checked
in lang/perl58/Makefile.  (It had been set previously only in bsd.pkg.mk.)
2004-04-25 22:42:51 +00:00
agc
c1b15d9ca1 Make USE_XPKGWEDGE default to "yes", as announced on tech-pkg@ last week. 2004-04-04 07:09:38 +00:00
tv
f425933991 Add Interix bits. 2004-03-11 17:53:16 +00:00
recht
c74a63f2fb Add LOWER_OPSYS_VERSUFFIX on FreeBSD platforms, so that the major
number is included in MACHINE_GNU_PLATFORM.
Fixes at least the build of wip/mingw-gcc.
Patch based upon the one provided by Michal Pasternak in PR 23856.
2004-03-09 20:39:50 +00:00
jlam
c40ee95964 * Move pkgsrc/mk/compiler/bsd.compiler.mk to pkgsrc/mk/compiler.mk.
Package Makefiles may now directly include compiler.mk.

* Don't include compiler.mk within bsd.prefs.mk any longer.  It was only
  included for the purposes of defining CC_VERSION.  Packages that want
  to test the value of CC_VERSION should now first include
  "../../mk/compiler.mk".  Any GCC_REQD statements in package Makefiles
  should be set before compiler.mk is included.

* Simpllfy pkgsrc/mk/compiler/*.mk files as a result of not needing to
  be included indirectly by bsd.prefs.mk.  We remove the special handling
  associated with detecting whether the file was included from within
  bsd.prefs.mk.  These files are now much more straightforward to write
  and understand.

* G/C the BSD_PREFS_MK stack mechanism as the only users (compiler/*)
  no longer need it.

* Ensure that directories are prepended to the PATH only from within
  bsd.pkg.mk.
2004-02-18 13:32:38 +00:00
jlam
01d241c9c1 Convert a debugging definition back into the real thing. 2004-02-14 11:28:28 +00:00
grant
2928aefaa2 add URL to my post to tech-pkg to deprecated Zoularis message. 2004-02-14 03:33:39 +00:00
grant
54133ebbb0 deprecate Zoularis: remove any tests for ZOULARIS* and bomb if
${LOCALBASE}/bsd/share/mk/zoularis.mk exists.
2004-02-14 03:26:09 +00:00
jlam
ae1283e612 Don't use the new pkg_info options unless the the pkg_install tools are
new enough to support them.  pkgsrc requires updated pkg_install for
older NetBSD releases and will ask the user to install them as the first
step to using pkgsrc, but the error messages about pkg_info not supporting
the "-K" option were confusing.
2004-02-13 18:00:29 +00:00
jlam
7699290f10 If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.
2004-02-06 19:04:24 +00:00
jlam
d72bb0e381 Hiding the PATH from certain phases of the build only accidentally worked
due to a type on gcc.mk that causes the ${_GCC_PREFIX}/bin to always be
prepended to the PATH.  The problem that was hiding was "make" resolving
to ${TOOLS_DIR}/bin/make if the package used GNU make, which broke
building since the package Makefile is a BSD Makefile and we passed
PATH to some phases of the build.  Fix this by expanding MAKE to the
full path to ${MAKE} in bsd.prefs.mk.  We also garbage collect the now
useless checks for PHASES_AFTER_BUILDLINK that cluttered the PREPEND_PATH
code.
2004-02-06 04:37:02 +00:00
jlam
fee0a809ce Simpilfy the test for whether we're inside bsd.prefs.mk. 2004-02-05 03:39:17 +00:00
jlam
629be8a499 Include bsd.compiler.mk inside both bsd.pkg.mk and bsd.prefs.mk and define
a stack-like mechanism in bsd.prefs.mk to detect when a we're inside
bsd.prefs.mk.
2004-02-05 03:37:47 +00:00
jlam
314f490c5b Use the new compiler selection framework instead of the old one. 2004-02-01 00:32:38 +00:00
jlam
2116fcb603 "fetch" is also a distinct build phase. 2004-01-27 02:36:59 +00:00
jlam
bde1c835c5 Purge one more instance of _NULL_SUFFIX. Fix by Marc Recht. 2004-01-25 19:23:20 +00:00
jlam
71c7ad7f16 pkgsrc requires PKGTOOLS_REQD>=20030918, so we don't need to conditionalize
passing "-S" to pkg_admin.
2004-01-25 18:42:53 +00:00
jlam
018df25438 Move all of the code that sets USE_XPKGWEDGE from bsd.pkg.mk into
bsd.prefs.mk as it's needed in setting X11PREFIX to the correct value,
which is also done in bsd.prefs.mk.  This is the follow-through to the
temporary fix in previous revision (1.141) of bsd.prefs.mk.
2004-01-23 17:55:17 +00:00
agc
d4ff22acec Temporary fix for xpkgwedge'd packages which were getting buildlinked
with a prefix of X11BASE, rather than LOCALBASE - check whether
USE_XPKGWEDGE is defined to {"YES", "yes"} as well as looking for the
existence of the xpkgwedge definition file when calculating the value
of X11PREFIX.
2004-01-23 16:49:47 +00:00
jlam
3306fc00c1 Introduce concept of the "phase" that we're in as we progress through
fetching, extracting, configuring, building, etc. of a package.  We
can check what phase we're in by examining the value of ${PKG_PHASE}
and comparing against PHASES_AFTER_<phase>, which list phases that
are "greater than or equal to" <phase>.

One useful example of how to use PKG_PHASE is:

.if !empty(PHASES_AFTER_EXTRACT:${PKG_PHASE})
#
# Some variable settings or targets here that rely on dependencies to
# already be installed, or ${WRKDIR} to be created, etc., as these are
# things that should have happened by the time "make extract" is
# completed.
#
.endif
2004-01-21 18:13:27 +00:00
agc
1569239e9f Indent to make nested blocks easier to distinguish. 2003-12-28 11:23:28 +00:00
tron
428a4e388c Fix back ".endif" logic which breaks "USE_INET6" on many platforms. 2003-12-28 10:09:38 +00:00
tron
547b3a4996 Override predefined "USE_INET6" if "USE_SOCKS" is defined. 2003-12-27 13:39:01 +00:00
tron
569a11b533 If "USE_INET6" is already defined (e.g. by NetBSD-current's "bsd.own.mk")
convert it to uppercase to make checks in packages like "bind9" work.
2003-12-27 13:28:46 +00:00
reed
9355da422e For BSD/OS, the customized libtool uses "bsdi", so set
LOWER_OPSYS to that.
2003-12-11 22:35:50 +00:00
grant
33ac0ad0c8 override bootstrap-pkgsrc's incorrect OBJECT_FMT on NetBSD 1.4. from
krister.

XXX this should also be fixed in bootstrap-pkgsrc and bmake's
mk-files.
2003-12-10 13:59:07 +00:00
reed
1b646f871d For BSD/OS, get rid of that libtool work-around of
renaming LOWER_OPSYS to match. I will fix ltconfig to work
with "bsdos" too instead.
2003-12-05 05:33:17 +00:00
reed
5ac3d68c8d In bsd.prefs.mk, get rid of possible "/" in OPSYS name and define
LOWER_OPSYS for libtool use under BSD/OS.

Add initial support for using pkgsrc under BSD/OS.  This was tested
under BSDI BSD/OS 4.3.1. (Thank you D. Hege.)

(Need to add BSDOS.x11.dist later.)
CVS ----------------------------------------------------------------------
2003-12-03 21:48:33 +00:00
fredb
ce8785b76c The "elf" goes after "netbsd", the version number after that. 2003-10-23 18:11:49 +00:00
grant
1e6dc66ad0 use 'solaris2' instead of 'solaris' in MACHINE_GNU_PLATFORM to
fix breakage in some GNU configure scripts.

based on patch from Jonathan Perkin in PR pkg/20701.
2003-10-11 06:46:45 +00:00
agc
2e630c6cd7 Use the -S argument to pkg_admin(1) if it exists. 2003-10-08 10:07:20 +00:00
grant
f8dc52ce38 make CC_VERSION available to packages by including bsd.prefs.mk.
it is of the form 'gcc-<version>' if gcc is being used, or empty
otherwise (for now).

requested by tron.
2003-09-24 12:22:03 +00:00
itojun
871cc4dcdb binary format detection for OpenBSD. Frederick Bruckman 2003-09-17 05:14:40 +00:00
grant
5fd5d7578c fix some indentation 2003-09-16 08:09:04 +00:00
jlam
5c377018fd In cases where we need the best match for a pkgpattern, use
"${PKG_BEST_EXIST} pkgpattern" instead of "${PKG_INFO} -e pkgpattern".  The
latter can return multiple package names if there are multiple versions of
a piece of software installed.  PKG_BEST_EXIST is defined to be
"${PKG_ADMIN} -b -d ${_PKG_DBDIR} -s "" lsbest", so it searches for the
best installed package that matches the given pkgpattern or else returns
the empty string.

Bump PKGTOOLS_REQD to 20030912 since pkg_admin(1) needs to know about "-b"
and "-d <dir>".
2003-09-13 05:55:14 +00:00
grant
b04786501a move a SunPro tweak to compiler.mk. 2003-09-12 16:07:09 +00:00
jlam
b49af05cee Move the default settings for USE_BUILDLINK[23] from bsd.pkg.mk into
bsd.prefs.mk so that they may be tested/used in buildlink[23].mk files.
2003-09-12 10:49:28 +00:00
jlam
841b57441b Merge pkgviews-mk branch into the HEAD by running:
cd pkgsrc/mk
	cvs update -Pd -A
	cvs update -Pd -j pkgviews-mk-base -j pkgviews-mk
2003-09-02 06:59:37 +00:00
jlam
fe1d66ea29 Create new variables PKG_*_CMD that contain just the paths to the various
pkg_install tools.
2003-08-31 11:04:58 +00:00
gavan
58bef710d6 Avoid circular dependency on gcc if USE_GCC[23] is set. 2003-08-21 16:16:46 +00:00
jlam
d742be9bff There are many uses for a common log file, so define one that may be
picked up and used by tools.mk, bsd.buildlink2.mk, etc.
2003-08-16 08:39:17 +00:00
grant
a5caa515f7 move gcc selection back to bsd.pkg.mk as the top-level Makefile
includes bsd.prefs.mk.
2003-07-13 13:27:18 +00:00
grant
bbfe9c9c20 don't set USE_GCC2 by default as it implies the use pkgsrc gcc2, and
move handling of gcc shared libraries to bsd.prefs.mk.
2003-07-13 13:10:43 +00:00
salo
d750aba607 More support bits for native Sun compilers (on Solaris).
Sun's C++ compiler (CC) doesn't support passing arguments to ld via -Wl flag,
remove this flag from the buildlink2 environment.
2003-07-09 16:07:21 +00:00
abs
4107ad2a64 Handle blank MACHINE_ARCH on Linux (as seen on 20030630 bootstrap kit) 2003-07-09 11:38:17 +00:00
salo
bf262a9684 Introduce few new variables for (mostly) non-GCC compilers use with pkgsrc
so compiler-dependent settings can be set later.

USE_GCC2    - GNU Compiler Collection 2.x	(default)
USE_GCC3    - GNU Compiler Collection 3.x	(used already)
USE_MIPSPRO - Silicon Graphics, Inc. MIPSpro Compiler
USE_SUNPRO  - Sun Microsystems, Inc. WorkShop/Forte/Sun ONE Studio
              Compiler Collection

(Intel compilers on Linux, anyone? :) )
2003-07-09 08:22:22 +00:00
jschauma
e8fa35b02c Use a better value as LOWER_OPSYS for IRIX. 2003-06-05 00:23:29 +00:00
grant
9794a404b1 back out previous, it does not work as it should. 2003-04-21 01:54:33 +00:00
grant
dabc7cd848 ensure LOWER_ARCH always gets set on Solaris, not only if MACHINE_ARCH
is non-sensical. shuffle some definitions around to follow style of
other entries.

semi-related to a tr(1) bug observed by sommerfeld@ Solaris 10/i386.
2003-04-21 01:35:10 +00:00