Up to [cvs.NetBSD.org] / pkgsrc / mk / wrapper
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
Remove clauses 3,4 from TNF-only copyright blocks. This is based on the decision The NetBSD Foundation made in 2008 to do so, which was already applied to src. This change has been applied to code which is likely not in other repositories. ok board@, reviewed by riastradh@
Transform -ggdb<level> to -g, too.
Add a bunch of supported options.
sunpro doesn't need -lstdc++.
Sunpro doesn't need -rdynamic, since the linker is sensible by default. This change also works around shells/scsh's broken check for -rdynamic.
sunpro doesn't know -ggdb.
Added a slight variation of the patch provided in PR 36187 by Naoto Morishima.
Added option handlers for all of -fPIC, -fpic, -KPIC, -kPIC, -xcode=pic13 and -xcode=pic32, as suggested in PR 35555. This also fixes and old bug where -fPIC (32 bit) had been translated to -kpic (13 bit), but apparently that doesn't make a big difference in practice.
Added a new variable wrapper_type to the wrappers, so that the transformations can decide whether they happen in a C or a C++ compiler. Now the wrappers don't depend on the basename of the executed compiler wrapper anymore. Fixes PR 35555.
The sunpro wrapper needs to distinguish whether cc or CC is called in some cases. XXX: There should be more support in the infrastructure for this case.
Options to subprocesses like the assember must pass the transformations. They are _not_ GCC warnings, although they start with -W.
Some of the SunPro compilers (cc, c89) cannot handle the -O0 and -O1 options. Some others (c99, CC) can. To avoid linker errors about "illegal option -- 1", these options are converted to -xO0 and -xO1, which work. Committed during the freeze to avoid breakage of packages. The code that passed the -O0 and -O1 options through is relatively new, so there may not have shown packages that break because of this.
The SunPro C++ compiler knows the -template=* option.
SunPro knows the -mt option for enabling multi-threaded options.
Adjusted the indentation and the order of checks to match the other files.
The -E option should be passed to SunPro without a warning.
Renamed transform_pass_unknown to transform_pass_with_warning and added transform_discard_with_warning.
Converted the SunPro wrapper to use the functions from wrapper-subr.sh. Added some code to check for unknown options. Reindented the file so that the compiler options are better visible. They had been hidden by the massive block comments before. Also, every option has got its own line so that one only needs to read the first column to find the relevant code.
Made the SunPro compiler understand gcc's -MM option for generating Makefile dependencies.
-E is an alias for --export-dynamic, which the Solaris linker does not understand, too.
Fixed the "unknown command" error messages for debug_log, which is a variable, not a shell function.
Use 'debug_log' instead of 'msg_log' so that these wrapper internals aren't exposed unless WRAPPER_DEBUG is set to "yes".
EOL the tv-derecurse branch; it has become too outdated. The last live revision can be fetched at the tv-derecurse-eol tag.
The SunPro compiler does not understand the gcc-specific -pipe option, but interprets it as -p -i -p -e:, and so discards the following argument. Fixed by simply discarding that argument.
Pullup ticket 709 - requested by Grant Beattie portability fixes for compiler wrapper Revisions pulled up: - pkgsrc/mk/wrapper/arg-pp-sunpro-cxx 1.1, 1.2 - pkgsrc/mk/wrapper/bsd.wrapper.mk 1.36, 1.37 - pkgsrc/mk/wrapper/transform-sunpro-cc 1.9 Module Name: pkgsrc Committed By: grant Date: Tue Jul 26 07:36:54 UTC 2005 Modified Files: pkgsrc/mk/wrapper: bsd.wrapper.mk Log Message: icc 9.0 wants the same options as 8.1. --- Module Name: pkgsrc Committed By: grant Date: Sat Aug 20 02:11:15 UTC 2005 Modified Files: pkgsrc/mk/wrapper: transform-sunpro-cc Log Message: add -xnolibmopt after -fast to disable the use of libsunmath (until it can be sanely statically linked). -- Module Name: pkgsrc Committed By: grant Date: Sat Aug 20 14:37:53 UTC 2005 Modified Files: pkgsrc/mk/wrapper: bsd.wrapper.mk Added Files: pkgsrc/mk/wrapper: arg-pp-sunpro-cxx Log Message: strip leading "-Qoption ld" from -R args for sunpro C++ compiler, to avoid duplicate "-Qoption ld" args when the -R args is later stripped. thanks to jlam@ for the hint. --- Module Name: pkgsrc Committed By: grant Date: Sun Aug 21 02:39:52 UTC 2005 Modified Files: pkgsrc/mk/wrapper: arg-pp-sunpro-cxx Log Message: preserve -Qoption arg if the 2nd next arg isn't -R.
add -xnolibmopt after -fast to disable the use of libsunmath (until it can be sanely statically linked).
Pullup ticket 692 - requested by Grant Beattie SunPro compiler wrapper fixes Revisions pulled up: - pkgsrc/mk/wrapper/transform-sunpro-cc 1.5, 1.6, 1.7, 1.8 Module Name: pkgsrc Committed By: rillig Date: Wed Jul 6 14:29:04 UTC 2005 Modified Files: pkgsrc/mk/wrapper: transform-sunpro-cc Log Message: Added the gcc option -fpermissive to the list of options that are ignored by the SunPro compiler. --- Module Name: pkgsrc Committed By: grant Date: Sat Aug 13 06:37:18 UTC 2005 Modified Files: pkgsrc/mk/wrapper: transform-sunpro-cc Log Message: transform -Wl,-soname to -h for sunpro --- Module Name: pkgsrc Committed By: grant Date: Thu Aug 18 05:02:53 UTC 2005 Modified Files: pkgsrc/mk/wrapper: transform-sunpro-cc Log Message: drop -Wl,--export-dynamic, as Solaris ld(1) default behaviour is to export all dynamic symbols. --- Module Name: pkgsrc Committed By: grant Date: Thu Aug 18 05:04:49 UTC 2005 Modified Files: pkgsrc/mk/wrapper: transform-sunpro-cc Log Message: pass through -f flags that sunpro understands verbatim, drop other -f* flags.
pass through -f flags that sunpro understands verbatim, drop other -f* flags.
drop -Wl,--export-dynamic, as Solaris ld(1) default behaviour is to export all dynamic symbols.
transform -Wl,-soname to -h for sunpro
Pullup ticket 629 - requested by grant beattie
infrastructure fixes for sunpro
Revisions pulled up:
- pkgsrc/mk/wrapper/transform-sunpro-cc 1.3-1.4
Module Name: pkgsrc
Committed By: grant
Date: Mon Jul 4 09:48:31 UTC 2005
Modified Files:
pkgsrc/mk/wrapper: transform-sunpro-cc
Log Message:
sunpro needs the -mt -lpthread arguments for POSIX threads according
to cc(1). modify the -pthread transform accordingly.
----
Module Name: pkgsrc
Committed By: grant
Date: Tue Jul 5 08:45:25 UTC 2005
Modified Files:
pkgsrc/mk/wrapper: transform-sunpro-cc
Log Message:
ignore more gcc-specific arguments:
-fomit-frame-pointer
-fwriteable-strings
-traditional
Added the gcc option -fpermissive to the list of options that are ignored by the SunPro compiler.
ignore more gcc-specific arguments: -fomit-frame-pointer -fwriteable-strings -traditional
sunpro needs the -mt -lpthread arguments for POSIX threads according to cc(1). modify the -pthread transform accordingly.
SunPro understands -Wl,* and passes to the relevant backend, so don't bin it. Fixes at least graphics/netpbm.
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.