Commit graph

26 commits

Author SHA1 Message Date
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
6bb67cd918 Garbage collect compiler.mk as it's superseded by the new compiler
selection framework in pkgsrc/mk/compiler.
2004-02-01 01:57:39 +00:00
sketch
8248226076 Ensure CPP is defined to use the Sun compiler when building packages
under USE_SUNPRO, to avoid the possibility of picking up "cpp" from a
local GCC installation.
2003-12-10 09:08:24 +00:00
grant
6b5bf9ca71 backout previous, it is no longer needed. 2003-11-12 13:13:43 +00:00
cube
c803330a12 Remove '-' from the version part of _GCC_IN_USE so that pkg_admin can deal
with the installed gcc when it has a localized version (such as our
gcc-3.3.2-nb1).
2003-10-24 12:07:14 +00:00
grant
29952c062d move the libstdc++ fake libtool archive stuff out of
!defined(COMPILER_MK) for now.

some packages include bsd.prefs.mk before defining USE_BUILDLINK2,
which resulted in the libstdc++ fake-la target being missed.

XXX the real fix is to include compiler.mk from both bsd.prefs.mk and
XXX bsd.pkg.mk, and have compiler.mk make the right decisions based on
XXX where it was included from.
2003-10-18 09:14:47 +00:00
grant
30e601d197 fix logic error introduced in last, sync comments about CC_VERSION
with reality.
2003-10-12 03:05:37 +00:00
grant
8031c4141d set CC_VERSION for non-gcc and use it in the BUILD_INFO file. 2003-10-11 03:43:14 +00:00
grant
beb87586be don't hardcode the -DHasGcc2... flags to imake, pass them only if
we're actually using gcc on Solaris.

fixes building of imake PIC code when the compiler is not gcc.
2003-10-11 02:44:17 +00:00
grant
1e3a7c9905 allow lang/gcc{,3} to be used to build themselves by only adding the
(build) dependency if the package being built is not the package which
is providing the compiler.
2003-10-06 11:14:22 +00:00
grant
e6c85cbd25 avoid F77/PKG_FC being recursively defined.
reported by krister.

XXX the Fortran gunk in bsd.pkg.mk will be moved to here later.
2003-10-06 07:11:19 +00:00
grant
5a32f4d868 sync comments with reality.
note once again that USE_GCC2/USE_GCC3 must not be defined in package
Makefiles. also note CC_VERSION and provide a usage example.
2003-09-28 09:53:56 +00:00
grant
cd5be5b371 if /usr/lib/libstdc++.la exists, create the corresponding fake libtool
archive in ${BUILDLINK_DIR}/lib so packages can find and use it.

fixes some build problems seen on Slackware Linux 9.
2003-09-28 09:48:00 +00:00
grant
fadc08de4b set CC and CXX defaults for SunPro when USE_SUNPRO is defined.
the path to cc and CC can be overridden in /etc/mk.conf or on
the command line.
2003-09-27 17:20:38 +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
grant
ca89371599 remove redefine of _GCC_PREFIX, whitespace fix. 2003-09-24 03:01:02 +00:00
gavan
fbb3e814f9 Work out _GCC_ARCHSUBDIR correctly, using the method from
lang/gcc3/buildlink2.mk
2003-09-23 19:19:33 +00:00
wiz
dfacdb1019 Test for egcs needs to come first, since egcs -v output also
contains "gcc". From Greg A. Woods in PR 22866.
2003-09-21 16:43:47 +00:00
grant
9fc9274cae explain why including this file in pkg Makefiles is useless. 2003-09-17 19:58:08 +00:00
grant
f694e1e329 honour GCC_REQD by testing $CC -v against it, and only pull in pkgsrc
gcc if required. see the comments for how to use the variables which
influence the decision.

eliminate some spurious shell warnings while I'm here.
2003-09-17 14:37:32 +00:00
salo
308a25fb9c Sync comments with reality. 2003-09-12 22:53:18 +00:00
grant
76c54876d1 remove redundant comment about USE_GCC2 and USE_GCC3 until they are
better handled.
2003-09-12 20:10:17 +00:00
grant
b04786501a move a SunPro tweak to compiler.mk. 2003-09-12 16:07:09 +00:00
grant
ada56b5a0b tidy up handling of LDFLAGS wrt USE_GCC_SHLIB a little. 2003-09-12 15:54:40 +00:00
salo
83dbd690de Typos/punctuation/caps. 2003-09-12 13:35:28 +00:00
grant
c934b0c4e0 start of improved compiler handling, mostly derived from the existing
gcc buildlink2.mk files and splitting the non-buildlink2.mk bits out
into compiler.mk.

this allows USE_GCC2 and USE_GCC3 to work with non-buildlink2 packages
again.
2003-09-12 13:03:38 +00:00