summaryrefslogtreecommitdiff
path: root/mk/wrapper
AgeCommit message (Collapse)AuthorFilesLines
2004-11-30Remove the trailing whitespace in the values of the toolchain variablesjlam1-1/+5
(CC, LD, CXX, etc.) if the default values have no arguments. Now, CC == "cc" and not "cc ".
2004-11-30Modify the way that the toolchain variables, e.g. CC, CPP, CXX, LD, etc.,jlam1-43/+47
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.
2004-11-20add framework support for Tru64 and the Compaq C compiler.grant4-3/+164
patches provided by Tobias Nygren <tnn at netilium dot org> with minor changes by me.
2004-11-12Insert the default values for WRAPPER_DEBUG and WRAPPER_UPDATE_CACHE asjlam2-4/+6
defaults within the wrapper script. This avoids requiring those two variables to be defined in the shell environment for the correct defaults to take effect.
2004-11-12Teach the native linker to accept "-pthread" by silently dropping it.jlam1-3/+12
This allows "-pthread" to be added to LDFLAGS for use by both the compiler and the linker.
2004-11-11-pthread is invalid for Interix gcc. Add a failure for it so thattv1-2/+2
portability oopses can be caught earlier.
2004-11-10Correct debugging output to show the actual script name.jlam2-4/+4
2004-11-10SunPro understands -Wl,* and passes to the relevant backend, so don't bin it.sketch1-3/+9
Fixes at least graphics/netpbm.
2004-11-09The "transform" file is used to transform arguments on the command line.jlam1-7/+46
The "untransform" file is used to unwrap *-config files and *.lai files. The transform file can be much stricter about what command line arguments should look like, so take advantage of that to fix the "libpath" and "libpath-in-define" regression tests.
2004-11-08g/c unused variable _ws_sep.jlam1-2/+1
2004-11-08Whitespace fixes.jlam1-75/+75
2004-11-08Remove unnecessary argument checks.jlam1-56/+1
2004-10-14Oy. For some reason, when doing :O:u, -L and -R options are strippedtv1-2/+1
completely (they say "cached" but never come out the other side). So revert previous, hopefully to find a resolution later....
2004-10-14Big speedup hack: Sort and uniqify ${_WRAP_TRANSFORM_CMDS}. Eliminatestv1-1/+2
many (hundreds, in some packages) multiple identical transformations.
2004-10-09Move -D_ALL_SOURCE for Interix, required for nearly every compilation, fromtv1-1/+4
the funky CPPFLAGS assignment into the new wrapper framework.
2004-10-08Drop the extraneous comma in "-Wl,-R,/dir" and turn it into "-Wl,-R/dir".jlam1-1/+15
Do the same for options that look like "-Wl,-L,/dir".
2004-10-06add initial support for IBM's XL C/C++ compiler. tested with versiongrant2-1/+75
6.0 on Mac OS X 10.3.5. to use XL C, set PKGSRC_COMPILER=xlc in mk.conf. XLCBASE defaults to /opt/ibmcmp/vacpp/6.0 (the default installation location on OS X), this can be overridden in mk.conf too. this is a work in progress - some simple packages can be built, but there are still lots of issues that need to be worked through.
2004-10-04Add a scan script that checks for "-v" on the command-line, and preventsjlam2-2/+53
the wrappers from adding extra flags to the command-line if "-v" exists. This makes "g++ -v" return the same error code for both the wrapper and the real executable and fixes the problem with the libtool-base build not correctly detecting the C++ compiler and thus not adding the CXX configuration tag to the final libtool script. Downgrade LIBTOOL_REQD to 1.5.10 since the newest version isn't needed with this change.
2004-09-27Move some wrapper definitions into a separate file wrapper-defs.mk that isjlam2-6/+49
included by bsd.prefs.mk. This allows the following variables to be used before bsd.wrapper.mk is included: WRAPPER_DIR WRAPPER_SRCDIR WRAPPER_BINDIR WRAPPER_SHELL WRAPPER_TMPDIR
2004-09-26Make _WRAPPEES into a public variable so that we can more easily createjlam1-8/+12
wrapper scripts in package-land.
2004-09-26We don't use skipargs here... it's all in logic.jlam1-2/+1
2004-09-26fix dylib handlingdanw1-2/+1
2004-09-26Fix rmdir command so it passes remove-dir in the buildlink-transformjlam1-4/+4
regression test.
2004-09-25Add Dan Winship's workaround to allow building on Darwin. This is only ajlam1-1/+5
temporary fix until I can find time to do this better.
2004-09-24Fix typo in comment.seb1-2/+2
2004-09-23Move @_WRAP_TRANSFORM_SED@ from the logic script into wrapper.sh so thatjlam3-5/+7
it can be customized per wrappee. This fixes the imake wrapper script to not do any transformations to -I... options.
2004-09-22Typo in comment.jlam1-2/+2
2004-09-22When mangling paths, also do (and undo) the transformations for fulljlam1-5/+7
paths to static archives and libtool archives. This should fix the problem where a mangled path sometimes makes its way into the the executed command line.
2004-09-22Add a toggle that determines whether we pass extra arguments or not. Thisjlam1-2/+11
is intended to be toggled by a $scan file. Simplify buildlink3 by removing _BLNK_LIBTOOL_LDFLAGS and just setting _WRAP_EXTRA_ARGS.* like all of the other wrappers.
2004-09-22Protect against underflow in the argument buffer in the inner while loop,jlam1-13/+5
noted in PR pkg/27014.
2004-09-21Initial commit of a new wrapper script framework that encapsulatesjlam19-0/+2500
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.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 10:32:45 +0000