summaryrefslogtreecommitdiff
path: root/mk
AgeCommit message (Collapse)AuthorFilesLines
2004-10-04Add a scan script that checks for "-v" on the command-line, and preventsjlam3-4/+55
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-10-04Fix completely hosed test for g++ when CXX=g++. The old test worked fine.tv1-2/+2
Revert until the hosage is tracked down and eliminated at the source. (Bump to libtool-1.5.10nb1, and make this the required version.)
2004-10-04When transforming from ${LOCALBASE} into ${BUILDLINK_DIR}, convertjlam1-9/+15
into the mangled name for ${BUILDLINK_DIR} as an intermediate step, then convert the mangled name into ${BUILDLINK_DIR} at the end. This avoids problems with too many substitutions when ${BUILDLINK_DIR} is a subdirectory of ${LOCALBASE}, as noted in PR pkg/27104.
2004-10-03Don't cache transformations of "-lfoo" into "rel/path/to/libfoo.la" becausejlam1-2/+2
"rel/path/to" can be different each time. This should fix problems with building transcode after the wrapper framework was integrated.
2004-10-03Don't echo the debug message for the targets whose output is usedhira1-9/+7
by other targets. OK'd by jlam. This should close pkg/24377.
2004-10-03Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10tv3-6/+4
in the process. (More information on tech-pkg.) Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and installing .la files. Bump PKGREVISION (only) of all packages depending directly on the above via a buildlink3 include.
2004-10-01Update the wording a bit when a license is not accepted, to betterhubertf1-4/+4
indicate the proper process: first read the license, then accept, and indicate so in /etc/mk.conf: yui% make ===> graphviz-1.12 has an unacceptable license: graphviz-license. ===> To view the license, enter "/usr/bin/make show-license". ===> To indicate acceptance, add this line to your /etc/mk.conf: ===> ACCEPTABLE_LICENSES+=graphviz-license *** Error code 1
2004-09-30Add and enable {jdk,jre}15rh1-8/+22
2004-09-30G/C _WRAPPER_SH.LIBTOOL which isn't needed (it's value was beingjlam1-13/+2
overwritten within bsd.wrapper.mk anyway). Also fix up the documentation surrounding that section. From Stoned Elipot in private email.
2004-09-30Make APR_USE_DB4 default to NO everywhere, now that subversion-baseepg1-8/+4
can build without it.
2004-09-28Remove ftp.sunet.se for now, as it contains at least one brokencube1-2/+1
archive (PR#27049 by Robert Elz).
2004-09-27Per jlam's suggestion, remove the libtoolize conditional altogether. Sometv1-7/+1
packages install libtool archives without using USE_LIBTOOL.
2004-09-27LIBTOOLIZE_PLIST doesn't even need to be conditional. If USE_LIBTOOL istv2-10/+4
set in the package Makefile, then a libtool transform will be done, period.
2004-09-27LIBTOOL_REQD in bsd.pkg.mk is newer than the version listed here; removetv2-4/+2
the _OPSYS local override.
2004-09-27Move some wrapper definitions into a separate file wrapper-defs.mk that isjlam3-7/+55
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-27Define PKGSRC_TOPDIR as the path to the top of the pkgsrc tree relativejlam1-19/+16
to the Makefile on which make is invoked. Use it instead of doing the same dance for finding defs.${OPSYS}.mk and bsd.pkg.defaults.mk.
2004-09-27In print-PLIST, handle '@exec ${MKDIR}' by PRINT_PLIST_AWK as well.rh1-2/+4
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-24Teach the libtool wrapper about the "clean" and "uninstall" modes, wherejlam1-4/+7
we don't append the BUIDLINK_LDFLAGS to the commandline.
2004-09-24Create ${BUILDLINK_DIR}/bin for use by packages that need to drop off ajlam1-2/+5
buildlink wrapper for an installed binary or script.
2004-09-24Make print-PLIST work if there are no *.la files.jlam1-2/+6
2004-09-24Fix typo in comment.seb1-2/+2
2004-09-23Teach gcc.mk about gcc34 so that setting GCC_REQD=3.4 in /etc/mk.conf willjlam1-5/+35
make pkgsrc do the right thing.
2004-09-23Support the ABI flags on MIPS platforms.jlam1-10/+12
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. Thisjlam3-7/+19
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-22Typo - "ressource".mason1-2/+2
2004-09-22Protect against underflow in the argument buffer in the inner while loop,jlam1-13/+5
noted in PR pkg/27014.
2004-09-22Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.jlam1-2/+2
All library names listed by *.la files no longer need to be listed in the PLIST, e.g., instead of: lib/libfoo.a lib/libfoo.la lib/libfoo.so lib/libfoo.so.0 lib/libfoo.so.0.1 one simply needs: lib/libfoo.la and bsd.pkg.mk will automatically ensure that the additional library names are listed in the installed package +CONTENTS file. Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-21Don't exit on error if the *.la file is not a libtool archive.jlam1-11/+11
2004-09-21X11_TYPE=xorg users:xtraeme1-1/+5
* Use builtin versions for Xfixes, fixesext, randrext and render. There's no need to install these packages from pkgsrc when using X.org >= 6.8.0, they were already installed.
2004-09-21Add 'ang' locale, initially used by eel2-2.8.0.jmmv11-11/+55
2004-09-21Add a lock_file function that generates lockfiles that are usable onjlam1-1/+57
NFS-mounted directories.
2004-09-21Initial commit of a new wrapper script framework that encapsulatesjlam55-2328/+3446
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.
2004-09-19Comment out old sourceforge URL for gd.tuwien.ac.at, and add commentedwiz1-3/+4
out URL where it will re-appear hopefully soon.
2004-09-19Correct path for Mozilla mirror on "ftp.funet.fi".tron1-2/+2
2004-09-16Make and mount the local patches directory when relevant. Fixes PR#26951cjep1-2/+10
from Masanori Mikawa.
2004-09-15Move definition of PKGNAME and PKGNAME_NOREV higher in the file since theirjlam1-14/+14
expanded values are used somewhere in the middle.
2004-09-15Default PKG_FAIL_UNSUPPORTED_OPTIONS to "no" to match current practicesjlam1-3/+3
for using bsd.options.mk, which is: PKG_DEFAULT_OPTIONS= <common options> PKG_OPTIONS.<pkg>= ${PKG_DEFAULT_OPTIONS} <mods to defaults>
2004-09-14Document THTTPD_LOG_FACILITY.wiz1-1/+7
2004-09-13Use /bin/false instead of false for NOLOGINmartti1-2/+2
2004-09-11Finish off the locking work, by adding locks around "make install" andagc1-3/+13
"make package", from a nudge by Greg Oster. No objections, but lots of mail, received from pkgsrc developers, to committing this during the stability freeze, but I'd really like this to go in pkgsrc-2004Q3.
2004-09-10* Do the *.la expansion within the current _PLIST_AWK_SCRIPT framework.jlam3-31/+91
We no longer require that LIBTOOL_LA_FILES be defined in the package Makefile, and the libtool archives should once again be listed in the PLIST. * Add a new yes/no variable "LIBTOOLIZE_PLIST" to control whether to have bsd.pkg.mk automatically expand *.la files in PLISTs into the true library names represented by the libtool archives. * Rename the "transform-la" script to "print-la-libnames" which more correctly reflects its function. Many thanks to Todd Vierling for the original implementation and for his contructive comments on how to improve the changes in this commit.
2004-09-08UNBUILDLINK_{PATTERNS,FILES} are actually no more, so garbage-collec themjlam1-6/+4
and update the documentation.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 19:31:46 +0000