The NetBSD Project

CVS log for pkgsrc/mk/compiler/mipspro.mk

[BACK] Up to [cvs.NetBSD.org] / pkgsrc / mk / compiler

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.43: download - view: text, markup, annotated - select for diffs
Sun Jan 18 21:08:07 2026 UTC (9 months, 3 weeks ago) by wiz
Branches: MAIN
CVS tags: pkgsrc-2026Q3-base, pkgsrc-2026Q3, pkgsrc-2026Q2-base, pkgsrc-2026Q2, pkgsrc-2026Q1-base, pkgsrc-2026Q1, HEAD
Diff to: previous 1.42: preferred, colored
Changes since revision 1.42: +1 -3 lines
mk: remove unused CC_VERSION_STRING

Only effective change is in ccache, which now uses CC_VERSION instead.

ccache sanity check by gdt@, thanks!

Revision 1.42: download - view: text, markup, annotated - select for diffs
Mon Aug 22 09:18:29 2011 UTC (15 years, 2 months ago) by cheusov
Branches: MAIN
CVS tags: pkgsrc-2025Q4-base, pkgsrc-2025Q4, pkgsrc-2025Q3-base, pkgsrc-2025Q3, pkgsrc-2025Q2-base, pkgsrc-2025Q2, pkgsrc-2025Q1-base, pkgsrc-2025Q1, pkgsrc-2024Q4-base, pkgsrc-2024Q4, pkgsrc-2024Q3-base, pkgsrc-2024Q3, pkgsrc-2024Q2-base, pkgsrc-2024Q2, pkgsrc-2024Q1-base, pkgsrc-2024Q1, pkgsrc-2023Q4-base, pkgsrc-2023Q4, pkgsrc-2023Q3-base, pkgsrc-2023Q3, pkgsrc-2023Q2-base, pkgsrc-2023Q2, pkgsrc-2023Q1-base, pkgsrc-2023Q1, pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3
Diff to: previous 1.41: preferred, colored
Changes since revision 1.41: +3 -1 lines

Fix bootstrap on IRIX with mipspro compiler, for details
see PR 42424. I couldn't fix this problem using TOOLROOT variable.

Revision 1.41: download - view: text, markup, annotated - select for diffs
Tue Jun 2 22:32:49 2009 UTC (17 years, 5 months ago) by joerg
Branches: MAIN
CVS tags: pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, pkgsrc-2009Q4-base, pkgsrc-2009Q4, pkgsrc-2009Q3-base, pkgsrc-2009Q3, pkgsrc-2009Q2-base, pkgsrc-2009Q2
Diff to: previous 1.40: preferred, colored
Changes since revision 1.40: +2 -2 lines
Learn from the AIX issues with hard links to symbolic links and always
create the compiler aliases with ln -fs.

Revision 1.40: download - view: text, markup, annotated - select for diffs
Sat May 30 18:16:26 2009 UTC (17 years, 5 months ago) by joerg
Branches: MAIN
Diff to: previous 1.39: preferred, colored
Changes since revision 1.39: +6 -1 lines
Rename GCC_USE_SYMLINKS to COMPILER_USE_SYMLINKS, implement it for the
other compiler drivers and enable it by default. Saves at least a
percent of build time even for trivial packages like lang/lua.

Revision 1.39: download - view: text, markup, annotated - select for diffs
Thu Feb 7 20:59:05 2008 UTC (18 years, 9 months ago) by rillig
Branches: MAIN
CVS tags: pkgsrc-2009Q1-base, pkgsrc-2009Q1, pkgsrc-2008Q4-base, pkgsrc-2008Q4, pkgsrc-2008Q3-base, pkgsrc-2008Q3, pkgsrc-2008Q2-base, pkgsrc-2008Q2, pkgsrc-2008Q1-base, pkgsrc-2008Q1, cwrapper, cube-native-xorg-base, cube-native-xorg
Diff to: previous 1.38: preferred, colored
Changes since revision 1.38: +5 -5 lines
Replaced _PKG_SILENT and _PKG_DEBUG with RUN.

XXX: Why do we have the exactly same code in all the files?

Revision 1.38: download - view: text, markup, annotated - select for diffs
Wed Mar 7 01:37:18 2007 UTC (19 years, 8 months ago) by rillig
Branches: MAIN
CVS tags: pkgsrc-2007Q4-base, pkgsrc-2007Q4, pkgsrc-2007Q3-base, pkgsrc-2007Q3, pkgsrc-2007Q2-base, pkgsrc-2007Q2, pkgsrc-2007Q1-base, pkgsrc-2007Q1, jlam-pkgviews-base, jlam-pkgviews
Diff to: previous 1.37: preferred, colored
Changes since revision 1.37: +6 -1 lines
Make the #error directive an error with MIPSpro.

Revision 1.37: download - view: text, markup, annotated - select for diffs
Fri Dec 15 12:46:24 2006 UTC (19 years, 11 months ago) by martti
Branches: MAIN
CVS tags: pkgsrc-2006Q4-base, pkgsrc-2006Q4
Diff to: previous 1.36: preferred, colored
Changes since revision 1.36: +3 -3 lines
Remove trailing spaces.

Revision 1.36: download - view: text, markup, annotated - select for diffs
Sat Dec 2 22:32:59 2006 UTC (19 years, 11 months ago) by jschauma
Branches: MAIN
Diff to: previous 1.35: preferred, colored
Changes since revision 1.35: +5 -1 lines
Instead of setting compiler flags in each package if it uses C99,
allow USE_LANGUAGES+=c99 and let gcc and mipspro do the right thing.
May need to be reviewed/added for other compilers.
ok rillig@

Revision 1.35: download - view: text, markup, annotated - select for diffs
Sun Oct 22 00:14:17 2006 UTC (20 years, 1 month ago) by rillig
Branches: MAIN
Diff to: previous 1.34: preferred, colored
Changes since revision 1.34: +9 -1 lines
Added header comments.

Revision 1.26.2.4
Wed Jun 7 15:25:39 2006 UTC (20 years, 5 months ago) by tv
Branches: tv-derecurse
FILE REMOVED
Changes since revision 1.26.2.3: +1 -1 lines
EOL the tv-derecurse branch; it has become too outdated.  The last live
revision can be fetched at the tv-derecurse-eol tag.

Revision 1.26.2.3: download - view: text, markup, annotated - select for diffs
Thu Jan 13 20:11:55 2005 UTC (21 years, 10 months ago) by tv
Branches: tv-derecurse
CVS tags: tv-derecurse-eol
Diff to: previous 1.26.2.2: preferred, colored
Changes since revision 1.26.2.2: +25 -16 lines
sync with HEAD

Revision 1.34: download - view: text, markup, annotated - select for diffs
Wed Jan 12 18:37:52 2005 UTC (21 years, 10 months ago) by jlam
Branches: MAIN
CVS tags: tv-derecurse-merge, tv-derecurse-base, pkgsrc-2006Q3-base, pkgsrc-2006Q3, pkgsrc-2006Q2-base, pkgsrc-2006Q2, pkgsrc-2006Q1-base, pkgsrc-2006Q1, pkgsrc-2005Q4-base, pkgsrc-2005Q4, pkgsrc-2005Q3-base, pkgsrc-2005Q3, pkgsrc-2005Q2-base, pkgsrc-2005Q2, pkgsrc-2005Q1-base, pkgsrc-2005Q1
Diff to: previous 1.33: preferred, colored
Changes since revision 1.33: +15 -10 lines
Rearrange how LANGUAGES.<compiler> is set so that we can more flexibly
detect when only parts of a compiler toolchain are present, e.g. the
SunPro C compiler is installed, but not the Fortran-77 compiler.

Revision 1.33: download - view: text, markup, annotated - select for diffs
Wed Jan 12 17:30:34 2005 UTC (21 years, 10 months ago) by jlam
Branches: MAIN
Diff to: previous 1.32: preferred, colored
Changes since revision 1.32: +9 -14 lines
Backout part of previous commit that was unrelated.

Revision 1.32: download - view: text, markup, annotated - select for diffs
Wed Jan 12 17:27:50 2005 UTC (21 years, 10 months ago) by jlam
Branches: MAIN
Diff to: previous 1.31: preferred, colored
Changes since revision 1.31: +15 -10 lines
Remove explicit overrides for CC and CXX that prevented using the
definitions supplied in /etc/mk.conf.  It should now be possible to
pass optimization flags directly using CC and CXX when using CCC and
xlC compilers.

Revision 1.31: download - view: text, markup, annotated - select for diffs
Wed Jan 12 16:41:14 2005 UTC (21 years, 10 months ago) by jlam
Branches: MAIN
Diff to: previous 1.30: preferred, colored
Changes since revision 1.30: +1 -7 lines
Remove explicit overrides for CC and CXX that prevented using the
definitions supplied in /etc/mk.conf.  It should now be possible to
pass optimization flags directly using CC and CXX when using SunPro
and MIPSpro compilers.

Revision 1.30: download - view: text, markup, annotated - select for diffs
Wed Jan 12 15:32:01 2005 UTC (21 years, 10 months ago) by jlam
Branches: MAIN
Diff to: previous 1.29: preferred, colored
Changes since revision 1.29: +11 -1 lines
Nuke USE_FORTRAN and bring the f2c handling within the mk/compiler
framework.  The list of changes include:

  * Modify compiler.mk so that "c" is always prepended to USE_LANGUAGES,
    so we no longer need to say it in package Makefiles.  Packages
    should now append to USE_LANGUAGES instead of setting it.

  * Create mk/compiler/f2c.mk which implements another pseudo-compiler
    "f2c" that may be used with any C compiler backend, e.g.

	PKGSRC_COMPILER= f2c ccache gcc

  * Teach the various "real" compiler files, e.g., sunpro.mk, mipspro.mk,
    etc., to use f2c if the native Fortran compiler isn't present.

Packages that use Fortran should now simply include the line:

	USE_LANGUAGES+=	fortran

in the package Makefile.

Revision 1.26.2.2: download - view: text, markup, annotated - select for diffs
Tue Nov 30 15:06:35 2004 UTC (21 years, 11 months ago) by tv
Branches: tv-derecurse
Diff to: previous 1.26.2.1: preferred, colored
Changes since revision 1.26.2.1: +25 -12 lines
merge from HEAD

Revision 1.29: download - view: text, markup, annotated - select for diffs
Tue Nov 30 14:50:37 2004 UTC (21 years, 11 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2004Q4-base, pkgsrc-2004Q4
Diff to: previous 1.28: preferred, colored
Changes since revision 1.28: +26 -13 lines
Modify the way that the toolchain variables, e.g. CC, CPP, CXX, LD, etc.,
are handled.  The idea now is to simply remove the paths in the values
of these variables, leaving behind only the basename plus any arguments,
e.g.:

	CC= /usr/local/bin/gcc       becomes   CC= gcc
	CPP= /usr/local/bin/gcc -E   becomes   CPP= gcc -E

The wrapper scripts are generated for every unique executable mentioned
by the toolchain variables, so for the example above, only a "gcc"
wrapper script is generated for ${CC} and ${CPP}.  PKG_{CC,CPP,CXX,etc.}
are the paths to the executables wrapped by the wrapper scripts.

Note that it's now possible to set "CC" to something more than just the
path to the compiler, e.g.

	CC= cc -ffast-math -funroll-loops -fomit-frame-pointer

and the full value of ${CC} will be passed through via CONFIGURE_ENV
and MAKE_ENV.

Revision 1.26.2.1: download - view: text, markup, annotated - select for diffs
Tue Nov 23 20:54:12 2004 UTC (21 years, 11 months ago) by tv
Branches: tv-derecurse
Diff to: previous 1.26: preferred, colored
Changes since revision 1.26: +6 -4 lines
merge from HEAD

Revision 1.28: download - view: text, markup, annotated - select for diffs
Tue Nov 23 05:32:22 2004 UTC (21 years, 11 months ago) by jlam
Branches: MAIN
Diff to: previous 1.27: preferred, colored
Changes since revision 1.27: +4 -4 lines
Use CCPATH instead of referring to the C compiler by its full path in
multiple places.

Revision 1.27: download - view: text, markup, annotated - select for diffs
Tue Nov 23 00:46:26 2004 UTC (21 years, 11 months ago) by dmcmahill
Branches: MAIN
Diff to: previous 1.26: preferred, colored
Changes since revision 1.26: +3 -1 lines
add {CC,CXX,FC,F77}PATH variables which give the complete path and
name of the {CC,CXX,FC,F77} compilers.  These will be used by pkgs
which need to know which compiler and where it is at run time.

Approved by jlam@

Revision 1.26: download - view: text, markup, annotated - select for diffs
Tue Sep 21 15:01:41 2004 UTC (22 years, 1 month ago) by jlam
Branches: MAIN
Branch point for: tv-derecurse
Diff to: previous 1.25: preferred, colored
Changes since revision 1.25: +9 -1 lines
Initial commit of a new wrapper script framework that encapsulates
the non-buildlink-related code and moves it out of mk/buildlink3 into
mk/wrapper.  The buildlink3 code is modified to simply hook its
transformations into the wrapper script framework.

The wrapper script framework has some new features:

* Support automatically passing "ABI" flags to the compiler and linker
  depending on the value of ${ABI}.  Currently supports the SunPro
  compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
  any of 32, n32, o32, and 64.

* making UnixWare GCC accept -rpath options and silently converting
  them into an appropriate LD_RUN_PATH

* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
  when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
  (requested by <tv>).

* Much improved debugging output.  It's possible to output the wrapper
  work log in-line with normal output by setting WRAPPER_LOG to
  "stderr".

Important differences in behaviour from the old buildlink3 code include:

* Only move the -l options to the end of the command line, leaving the
  -L options in-place.

* Extend the autodetection of the libtool mode to detect "compile" and
  "uninstall".

* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
  -L/usr/lib/* was being mangled improperly.

* Remove the top-level "buildlink" target; instead, make buildlinking
  occur as part of the "wrapper" target.

* mangle and sub-mangle are only meant to transform directories in
  -I, -L, and rpath options, so remove the lines in
  buildlink3/gen-transform.sh that transformed bare directories.

* Add the ability for the libtool wrapper to be called just to unwrap
  an existing libtool archive by running:

	libtool --mode=unwrap -o libfoo.la

  The old --fix-la syntax no longer works.


20040818
========
* Initial release of a new wrapper script framework that encapsulates
  the non-buildlink-related code and moves it out of mk/buildlink3.
  These features include:

   * making MIPSpro accept GCC options
   * making MIPSpro "ucode" accept GCC options
   * making SunPro accept GCC options
   * making "ld" accept -Wl,* options and silently removing the "-Wl,"
   * (NEW) making UnixWare GCC accept -rpath options and silently
     converting them into an appropriate LD_RUN_PATH

  One major benefit of this is that the buildlink3 code is now much
  tighter and easier to understand since it concerns itself solely
  with buildlink-related details.  I haven't yet optimized the wrapper
  cache, so the new wrapper scripts may take slightly longer to execute
  than the old buildlink3 wrapper scripts, but I'll be improving this
  over time.


20040821
========
* Move the inclusion of $cmd_sink outside of the main loop in wrapper.sh
  so that the $cmd_sink script can be used to globally scan and process
  the arguments.  Move the LD_RUN_PATH code to a cmd-sink-unixware-gcc
  script.  Garbage-collect the now unused export_vars-related code.

* Add cmd-sink-aix-xlc for AIX xlc that munges -Wl,-R* into an
  appropriate -blibpath option.

* Add cmd-sink-interix-gcc and cmd-sink-interix-ld that errors out
  when it sees -fpic/-fPIC and -shared/-Bshareable, respectively
  (requested by <tv>).

* Move the code that converts full paths to shared libraries into the
  "-Ldir -llib" equivalents from the buildlink3 code into wrapper/logic.
  Remove the same from bsd.buildlink3.mk and gen-transform.sh.

* Move the code that checks for absolute rpaths from the buildlink3
  code into wrapper/arg-source.  Remove the same from bsd.buildlink3.mk
  and gen-transform.sh.

* Only move the -l options to the end of the command line, leaving the
  -L options in-place.

* Add more debugging code.


20040824
========
* Fix quoting problems after arguments are transformed.  Remove the
  hack that was inserted that magically made almost everything work
  because we do it the right way now.

* Move the inclusion of $logic outside of the main loop in wrapper.sh
  so that the $logic script doesn't have to worry about underflowing
  the argument buffer.

* Encapsulate the loop in wrapper.sh that fills the argument buffer
  entirely within the arg-source script.

* Move from the logic script into the arg-source script the
  transformations that merge or split arguments.

* Fix bug where skipargs was effectively being ignored if it was more
  than 1.

* Handle the whitespace in transformations in the logic script that
  turn one library option into multiple library options, e.g.
  "-lreadline" -> "-ledit -ltermcap".

* Allow you to specify an environment variable WRAPPER_SKIP_TRANSFORM
  for whether you wish to skip the transformation step in the logic
  script.  This is intended for testing purposes.

* Added check_prog() and init_lib() functions to the shell code library
  to make it more reusable outside of the wrapper framework.

* Allow the msg_log() function to output to "stdout" or "stderr".  If
  you want to have all of the logging appear on the screen, then you
  can now set WRAPPER_LOG=stderr.

* Make some of the script components not overridable on a per-wrapper
  basis.

* Add a gen-transform.sh script that generates transformation sedfiles.
  The "transform" script is used to transform arguments, while the
  "untransform" script is used to unwrap files.  Move the no-rpath
  logic from buildlink3/gen-transform.sh into wrapper/gen-transform.sh
  since it's not buildlink3-specific.

* Check for a non-empty blibpath before adding the option in
  cmd-sink-aix-xlc.

* Extend the autodetection of the libtool mode to detect "compile" and
  "uninstall".

* Add a cmd-sink-libtool script that doesn't pass linker options to
  libtool unless we're in "link" mode.

* Set _USE_RPATH to "yes" for UnixWare so that the wrappers will see the
  rpath options and convert them to a LD_RUN_PATH definition.

* Add more debugging code.


20040826
========
* Rewrite buildlink3/gen-transform.sh to produce more precise sed commands.
  Drop some unused commands from the mini-language, and add a few more
  that are more restrictive in their scope.

* Fix problem where repeated options weren't properly handled by some
  of sed commands.  It's not enough that they're "global replace",
  since some patterns match separator characters before and after each
  option.  We must repeat those patterns twice to catch all instances
  correctly.

* Fix problem noted in both PR pkg/24760 and PR pkg/25500, where
  -L/usr/lib/* was being mangled improperly.

* Remove the top-level "buildlink" target; instead, make buildlinking
  occur as part of the "wrapper" target.

* Add more debugging code.


20040828
========
* Added a head_queue function to shell-lib that returns the head of the
  named queue without popping it off the front of the queue.

* Strip consecutive, repeated library options from the command line when
  we read it in the logic script.

* Be more careful about not underflowing the argument buffer.


20040906
========
* shell-lib was moved into pkgsrc/mk/scripts; correct references to that
  file in the wrapper code.

* Use opt-sub instead of sub-mangle when protecting -I/usr/include/*
  and -L/usr/lib/* from buildlink transformations.  This avoids adding
  lines that look like "-I-I..." in the transformation sedfiles.

* mangle and sub-mangle are only meant to transform directories in
  -I, -L, and rpath options, so remove the lines in
  buildlink3/gen-transform.sh that transformed bare directories.

* Fix bug in strip-slashdot where the "." wasn't backquoted and thus
  matched all characters instead of only the "." character.

* Change the libtool wrapper to use a modified buildcmd script that
  doesn't rearrange any of the arguments.  This should fix spurious
  problems where libtool doesn't understand how to parse the command
  line when the -l options are moved to the end of the argument list.

* Fix bug in the logic script where the $cachearg and $cachedarg
  weren't being properly set at all times, which caused the cache to
  contain the wrong transformed argument.


20040907
========
* Support automatically passing "ABI" flags to the compiler and linker
  depending on the value of ${ABI}.  Currently supports the SunPro
  compiler with ${ABI} == 64 and the MIPSPro compiler with ${ABI} as
  any of 32, n32, o32, and 64.

* Move back the code that splits absolute paths to shared libraries
  from arg-source back into logic.  This allows us to correctly skip
  splitting those paths based on the previous option.  Also add a
  sanity check that the library name in the split argument doesn't
  contain a "/" since shell globs are not as precise as REs.

* Don't transform the path given after --dynamic-linker (used by GNU
  ld for ELF linkage).

* Add the ability for the libtool wrapper to be called just to unwrap
  an existing libtool archive by running:

	libtool --mode=unwrap -o libfoo.la


20040914
========
* Add a loop in libtool-fix-la to ensure that all of the options listed
  in the dependency_libs lines of *.lai files are processed.  This fixes
  a buildlink3 leakage bug.

* Merge the gen-transform.sh scripts between buildlink3 and wrapper and
  place them all in wrapper.  This makes sense since the commands simply
  allow for many types of transformations, which buildlink3 takes
  advantage of, but there is nothing inherently buildlink-ish about
  those commands.

* Don't directly manipulate SUBST_SED.unwrap.  Instead, create the
  value of SUBST_SED.unwrap by combining several other variables
  (currently just _UNWRAP_SED) to ensure that the correct ordering is
  preserved.

* Correct some confusing debugging messages.

Revision 1.25: download - view: text, markup, annotated - select for diffs
Fri Aug 27 06:29:09 2004 UTC (22 years, 2 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2004Q3-base, pkgsrc-2004Q3
Diff to: previous 1.24: preferred, colored
Changes since revision 1.24: +6 -3 lines
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively.  In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath.  The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use.  They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively.  Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

Revision 1.24: download - view: text, markup, annotated - select for diffs
Thu Jun 10 20:34:08 2004 UTC (22 years, 5 months ago) by jschauma
Branches: MAIN
CVS tags: pkgsrc-2004Q2-base, pkgsrc-2004Q2
Diff to: previous 1.23: preferred, colored
Changes since revision 1.23: +7 -1 lines
We really need to pass the ABI flags to both CFLAGS and LDFLAGS, since
some packages (for example ntp4) have configure scripts that try to be
clever and insert their own if they don't find any.  This would be wrong
on a system that relies on /etc/compiler.defaults to choose the correct
ABI.

Revision 1.23: download - view: text, markup, annotated - select for diffs
Thu May 6 14:25:02 2004 UTC (22 years, 6 months ago) by jschauma
Branches: MAIN
Diff to: previous 1.22: preferred, colored
Changes since revision 1.22: +4 -1 lines
Finally set _COMPILER_LD_FLAG.
(Not having this set caused various rpath related problems, as the compiler
was passed ' -rpath,/path' instead of '-Wl,-rpath,/path', leading to
a rpath of ",path", which of course wouldn't work.)

Revision 1.22: download - view: text, markup, annotated - select for diffs
Wed Feb 18 13:32:38 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
CVS tags: pkgsrc-2004Q1-base, pkgsrc-2004Q1
Diff to: previous 1.21: preferred, colored
Changes since revision 1.21: +21 -30 lines
* 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.

Revision 1.21: download - view: text, markup, annotated - select for diffs
Wed Feb 18 11:13:54 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.20: preferred, colored
Changes since revision 1.20: +3 -3 lines
Allow overriding CC_VERSION_STRING and CC_VERSION.

Revision 1.20: download - view: text, markup, annotated - select for diffs
Sun Feb 15 13:34:33 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.19: preferred, colored
Changes since revision 1.19: +3 -3 lines
Create wrappers for the compilers for every language supported by the
compiler set.  This will cause the libtool configuration found in several
packages to use the correct C++ compiler even though the package doesn't
use C++.  This was causing bugs when CXXFLAGS contained flags not
understood by the system gcc-2.95.3.

Revision 1.19: download - view: text, markup, annotated - select for diffs
Thu Feb 12 21:37:08 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.18: preferred, colored
Changes since revision 1.18: +1 -3 lines
Remove CPP setting for now until I find a better way to wrap these.  This
backs out the changes in rev. 1.24 of mk/compiler.mk, but I will restore
the behaviour elsewhere.

Revision 1.18: download - view: text, markup, annotated - select for diffs
Thu Feb 12 11:50:46 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.17: preferred, colored
Changes since revision 1.17: +2 -2 lines
Prevent non-zero exit status when calling the compiler to print out the
version string.

Revision 1.17: download - view: text, markup, annotated - select for diffs
Thu Feb 12 08:54:48 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +5 -3 lines
Generate a more informative string "CC_VERSION_STRING" that is passed to
ccache as the compiler information to hash.

Revision 1.16: download - view: text, markup, annotated - select for diffs
Mon Feb 9 05:50:03 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +6 -3 lines
Apparently, GCC isn't the only compiler that tries to be clever by checking
with what path it was invoked.  Copy the driver script trick from gcc.mk
into mipspro.mk and sunpro.mk.

Revision 1.15: download - view: text, markup, annotated - select for diffs
Sun Feb 8 02:59:14 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +7 -4 lines
* Let CC/CXX/CPP/FC always point to the compiler used in the actual
  building of software.  For packages that use either buildlink2 or
  buildlink3, this would be the wrapper script in ${BUILDLINK_DIR}.

* Garbage-collect _BLNK_WRAP_SETENV.* as those are not needed after
  the above changes.  Configure and make processes will automatically
  find the right compilers in the PATH.

* PKGLIBTOOL and PKGSHLIBTOOL are no longer needed since LIBTOOL and
  SHLIBTOOL point to the correct libtools regardless of any
  USE_BUILDLINK[23] definitions.

Revision 1.14: download - view: text, markup, annotated - select for diffs
Sat Feb 7 02:58:10 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +26 -9 lines
Symlink the compiler into ${WRKDIR} so that there's a consistent path to
the compiler and that it's behind .tools/bin and .buildlink/bin, regardless
of whether or not we're using gcc3-c or not, or whether it's been installed
yet in the process of satisfying dependencies, etc.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Fri Feb 6 04:37:02 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +2 -3 lines
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.

Revision 1.12: download - view: text, markup, annotated - select for diffs
Fri Feb 6 03:04:50 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +6 -2 lines
We only prepend a directory to the PATH if we haven't already done so
(by checking PREPEND_PATH) and only for those phases of the build that
care about the PATH (buildlink or later).  We also pass the PATH to
those same phases of the build so that executing ${CC} will work correctly
from custom {pre,do,post}-* targets that occur at buildlink time or
later.

Revision 1.11: download - view: text, markup, annotated - select for diffs
Thu Feb 5 22:05:42 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +4 -3 lines
Get the version string out of the MIPSpro compiler in the right way.

Revision 1.10: download - view: text, markup, annotated - select for diffs
Thu Feb 5 03:39:17 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +2 -2 lines
Simpilfy the test for whether we're inside bsd.prefs.mk.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Thu Feb 5 03:35:20 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +25 -15 lines
Allow bsd.compiler.mk to be included by both bsd.prefs.mk and bsd.pkg.mk.
Any additions to DEPENDS/BUILD_DEPENDS or inclusions of buildlink[23].mk
files are deferred till bsd.compiler.mk is included by bsd.pkg.mk.  We
allow bsd.compiler.mk to be included by bsd.prefs.mk solely for the purpose
of setting CC_VERSION properly for use by package Makefiles.

There is the surprising behaviour that CC_VERSION won't necessarily have
the correct value at all times until after "make extract" has been
completed (dependencies are installed before "make extract"), so package
Makefile writers should keep that in mind.  Just to note that this is
_existing_ behaviour that's preserved by these changes.

Revision 1.8: download - view: text, markup, annotated - select for diffs
Thu Feb 5 01:57:38 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +5 -1 lines
Don't compute the CC_VERSION unless ${CC} exists.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Tue Feb 3 20:38:39 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +2 -2 lines
Fix a pervasive cut-and-paste bug: change a = back into a +=.  Noted by
David Brownlee in private email.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Mon Feb 2 11:04:17 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +4 -2 lines
Only prepend the compiler package location to the PATH if we actually
request a compiler that's supported by the named compiler package.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Mon Feb 2 10:03:46 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +15 -1 lines
Support a new variable in package Makefiles:

USE_LANGUAGES
	Lists the languages used in the source code of the package,
	and is used to determine the correct compilers to install.
	Valid values are: c, c++, fortran, java, objc.  The default
	is "c".

Packages that don't need any compilers and set this variable to an
empty value, e.g. "USE_LANGUAGES=".

This can probably be combined in some smart way with setting
USE_GCC_SHLIBS and USE_FORTRAN automatically.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Sun Feb 1 01:03:22 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +2 -1 lines
Prepend ${MIPSPROBASE}/bin to the PATH so that the correct compilers are
found by ccache and distcc.

Revision 1.3: download - view: text, markup, annotated - select for diffs
Sun Feb 1 01:02:37 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +2 -2 lines
Spell MIPSPROBASE correctly.

Revision 1.2: download - view: text, markup, annotated - select for diffs
Sun Feb 1 00:59:51 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +2 -3 lines
We're included by bsd.prefs.mk, so no need to include bsd.prefs.mk for
anything.

Revision 1.1: download - view: text, markup, annotated - select for diffs
Sun Feb 1 00:31:00 2004 UTC (22 years, 9 months ago) by jlam
Branches: MAIN
New compiler specification framework, based on mk/compiler.mk.  The
changes from the old compiler.mk are:

  * Split apart the compiler-specific logic into separate files.  This
    should make supporting other compilers a bit easier.

  * Deprecate all of the USE_* compiler.mk variables, e.g. USE_GCC[23],
    USE_SUNPRO, etc.  It's all replaced with a new PKGSRC_COMPILER
    variable.

  * Clean up the GCC handling so that it's all controlled by a single
    variable GCC_REQD.  The following behaviour is expected:

    (a) If USE_PKGSRC_GCC is defined, then pretend there is no GCC on
        the system.
    (b) If there is no GCC, then the appropriate GCC corresponding to
        GCC_REQD is installed and used.
    (c) If there is a GCC, if it satisfies GCC_REQD, then use it;
        otherwise install and use the appropriate GCC package.
    (d) If lang/gcc is installed and GCC_REQD > 2.95.3, then lang/gcc3
        is installed and used.
    (e) If lang/gcc3 is installed and GCC_REQD = 2.95.3, then gcc3 is
        still used instead of installing lang/gcc.

New features include:

  * PKGSRC_COMPILER takes a list of values specifying the chain of
    compilers to call when building packages.  Valid values are:

	distcc          distributed C/C++ (chainable)
	ccache          compiler cache (chainable)
	gcc             GNU
	mipspro         Silicon Graphics, Inc. MIPSpro
	sunpro          Sun Microsystems, Inc. WorkShip/Forte/Sun
			ONE Studio

    The default is "gcc".  You can use ccache and/or distcc with an
    appropriate PKGSRC_COMPILER setting, e.g. "ccache distcc gcc".

  * Change GCC_REQD to hold a list of values that we scan through to
    find the highest version of GCC required by the build.  Package
    Makefiles should now do "GCC_REQD+=..." instead of "GCC_REQD=...".

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>