Commit graph

90 commits

Author SHA1 Message Date
wiz
921b38d138 Remove superfluous quotes around SUBST_MESSAGE. 2006-01-16 23:35:29 +00:00
rillig
999f8b6e04 Applied all quoting fixes found by "pkglint --autofix". 2005-12-05 22:07:07 +00:00
rillig
567d9fb684 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.
2005-11-28 13:43:24 +00:00
schwarz
a315454cc6 added missing header lines. 2005-10-30 10:33:23 +00:00
schwarz
7e79f31cbf added support for the SGI IDO (IRIX Development Option) cc used by IRIX 5.3.
changes approved by jschauma and recht.
2005-10-16 19:44:44 +00:00
tv
3d41114d3f Make WRAPPER_SHELL configurable. 2005-10-10 12:33:29 +00:00
grant
7b498027a9 preserve -Qoption arg if the 2nd next arg isn't -R. 2005-08-21 02:39:52 +00:00
grant
7bdc3361fc 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.
2005-08-20 14:37:53 +00:00
grant
fff581f880 add -xnolibmopt after -fast to disable the use of libsunmath (until it
can be sanely statically linked).
2005-08-20 02:11:15 +00:00
grant
9f4fe6c27d pass through -f flags that sunpro understands verbatim, drop other -f*
flags.
2005-08-18 05:04:49 +00:00
grant
0744c46196 drop -Wl,--export-dynamic, as Solaris ld(1) default behaviour is to
export all dynamic symbols.
2005-08-18 05:02:53 +00:00
grant
6cd103ed89 transform -Wl,-soname to -h for sunpro 2005-08-13 06:37:18 +00:00
jlam
ca47ca0ada Hardcode a workaround for perl's DynaLoader.a which is definitely a
PIC code archive, but libtool isn't smart enough to realize it.  Munge
the name within cmd-sink-libtool into something that will make libtool
recognize it as a PIC code archive.  We unmunge it in arg-pp-main so
non-libtool wrappers see the right thing.  This let's us use libtool
to link applications with an embedded Perl interpreter.

I feel so dirty...
2005-08-05 19:46:41 +00:00
grant
b1f57c9784 icc 9.0 wants the same options as 8.1. 2005-07-26 07:36:54 +00:00
grant
89cfcef364 fix typo in comment. 2005-07-23 04:48:12 +00:00
grant
a457387735 ensure gcc options are always passed to imake when using gcc on
Solaris.

fixes PR pkg/29608.
2005-07-23 04:45:30 +00:00
rillig
6474b33a62 Added the gcc option -fpermissive to the list of options that are ignored
by the SunPro compiler.
2005-07-06 14:29:04 +00:00
grant
597263b97a update copyright year 2005-07-06 03:35:28 +00:00
grant
ec6f7fe9a7 add cmd-sink for sunpro C++ which links shared libraries with the
standard C++ runtime libraries.

we need to explicitly do this because ${CXX} only links against the
C++ runtime libraries when building an executable, not a shared
object. this results in executables linked against libraries linked by
${CXX} unable to resolve C++ symbols at runtime.

fixes packages which link shared libraries using ${CXX}, including
graphics/glu, databases/db4, and packages which use shared libraries
provided by these packages.
2005-07-06 03:31:24 +00:00
grant
14b4d18530 ignore more gcc-specific arguments:
-fomit-frame-pointer
	-fwriteable-strings
	-traditional
2005-07-05 08:45:25 +00:00
grant
669abfdb53 sunpro needs the -mt -lpthread arguments for POSIX threads according
to cc(1). modify the -pthread transform accordingly.
2005-07-04 09:48:31 +00:00
jlam
fe40930572 Forgot the strip the comma when removing "-Wl," from the the next
argument during argument merging.
2005-06-09 17:06:21 +00:00
jlam
532553f653 Properly turn:
-Wl,-rpath -Wl,/dir1:/dir2:/dir3
into:
	-Wl,-rpath,/dir1 -Wl,-rpath,/dir2 -Wl,-rpath,/dir3

Do the same for -Wl,-R and -Wl,-rpath-link.  This makes the wrapper
scripts pass the test in regress/buildlink-transform/rpath-merge.mk
and fixes PR pkg/27702.
2005-06-08 05:54:17 +00:00
jlam
ce74a9adee Update comment to reflect implementation. 2005-06-08 05:02:50 +00:00
jlam
53c57e3bf6 Remove part of comment that is no longer true. 2005-06-08 04:54:27 +00:00
rillig
50085b3e47 Made sure the :sh operator does not result in an empty string. Rewrote the
variable substitution for the find(1) command to be more readable.
2005-05-20 22:40:36 +00:00
jlam
262ed77f43 Change instances where we stored shell command in a make variable into
variables that use the :sh modifier.  This still causes expansion to only
happen when referenced, and has the advantage of being :Q-safe.

Bring back the changes from revision 1.19 of mk/subst.mk now that the
problem noted above has been fixed.  This passes the buildlink-unwrap
regression test.
2005-05-20 21:36:05 +00:00
jlam
06697c97a8 Add missing required argument to msg_log. 2005-05-16 17:54:51 +00:00
jlam
0dbd0c0762 Rename MAKE_VARS to MAKEVARS so that it more closely resembles
"MAKEFLAGS".  Both "MAKEVARS" and "MAKEFLAGS" affect the package-level
make process, not the software's own make process.
2005-05-11 22:08:18 +00:00
jlam
03e9337879 Teach bsd.pkg.mk to create a phase-specific "makevars.mk" file that
caches variable definitions that were computed by make.  These variables
are specified by listing them in MAKE_VARS, e.g.,

	.if !defined(FOO)
	FOO!=	very_time_consuming_command
	.endif
	MAKE_VARS+=	FOO

bsd.pkg.mk will include only the one generated during the most recent
phase.  A particular phase's makevars.mk file consists of variable
definitions that are a superset of all of the ones produced in previous
phases of the build.

The caching is useful because bsd.pkg.mk invokes make recursively,
which in the example above has the potential to run the very time-consuming
command each time unless we cause FOO to be defined for the sub-make
processes.  We don't cache via MAKE_FLAGS because MAKE_FLAGS isn't
consistently applied to every invocation of make, and also because
MAKE_FLAGS can overflow the maximum length of a make variable very
quickly if we add many values to it.

One important and desirable property of variables cached via MAKE_VARS
is that they only apply to the current package, and not to any
dependencies whose builds may have been triggered by the current
package.

The makevars.mk files are generated by new targets fetch-vars,
extract-vars, patch-vars, etc., and these targets are built during
the corresponding real-* target to ensure that they are being invoked
with PKG_PHASE set to the proper value.

Also, remove the variables cache file that bsd.wrapper.mk was generating
since the new makevars.mk files provide the same functionality at a
higher level.  Change all WRAPPER_VARS definitions that were used by
the old wrapper-phase cache file into MAKE_VARS definitions.
2005-05-09 05:06:55 +00:00
tv
91b28b7d9a In line with the unconditional inclusion in bsd.pkg.mk, bsd.buildlink3.mk
must always bee included too.
2005-04-07 16:56:00 +00:00
tv
fe3c1321bf USE_BUILDLINK3 is no longer optional (and cannot be turned off). Per mail
to tech-pkg:

=====

* USE_BUILDLINK3=YES will be unconditional.  (In fact, USE_BUILDLINK3 will
  be ignored altogether by mk/; but see below.)

* NO_BUILDLINK and NO_WRAPPER will be ignored by mk/.  If a build happens,
  these phases will happen.

* The existing NO_BUILD will imply the previous NO_BUILDLINK and NO_WRAPPER.
  If no build happens, those phases are not needed.

* NO_TOOLS will be ignored by mk/.  The tools phase, which provides much
  more than just the C compiler, will always happen regardless of package.
  This will make metapackage builds only slightly slower, in trade for far
  less user error.
2005-03-24 17:46:00 +00:00
grant
6f23238a15 fix previous to work with pkgsrc bmake, and add a comment explaining
why it must be done this way.
2005-03-08 00:52:31 +00:00
agc
8fb629087b Also echo the wrapper stages if PKG_VERBOSE is defined, not just when
PKG_DEBUG_LEVEL > 1.
2005-03-06 22:27:12 +00:00
grant
fab0a1b153 add wrappers to transform arguments for AIX's ld(1), notably, if we
are dynamically linking, the -brtl flag must be passed to the linker
so that the runtime linker is used.

tested on AIX 4.3 and 5.1 by garbled@.
2005-02-19 04:19:59 +00:00
grant
892028f6a6 drop -fexceptions which icc doesn't understand. 2005-02-16 23:58:29 +00:00
grant
8910a7722d Always link against the Intel provided C++ runtime library. 2005-02-16 11:24:44 +00:00
grant
94c992087d properly detect icc 8.1, which needs a different argument to
statically link the Intel provided libraries.
2005-02-16 10:59:03 +00:00
grant
ffa50e5ca6 it's 2005, not 2004. 2005-02-15 09:42:23 +00:00
grant
9fd9fe5331 add support for icc, the Intel C++ Compiler (Linux).
icc is a high performance compiler suite for Linux/i386 and ia64, and
is free for non-commercial use. see:

	http://www.intel.com/software/products/compilers/clin/

for more information.

tested with icc version 8.0 and 8.1 on Slackware 10/i386.
2005-02-15 07:43:43 +00:00
jlam
e9eb68750b The libtool wrapper should always do the compiler wrapper transformations,
so move the setting for _WRAP_ARG_PP.LIBTOOL out of conditional areas of
bsd.wrapper.mk and set it globally in bsd.buildlink3.mk with the rest of
the libtool wrapper variables.
2005-02-15 03:18:50 +00:00
jlam
993d395028 Add some more debugging annotations for the work log to note split args
and skipped args.
2005-02-14 21:43:11 +00:00
jlam
9a48aa99f1 Move some Darwin-specific code from arg-pp-main into arg-pp-darwin-gcc. 2005-02-14 21:33:36 +00:00
jlam
a4719cbfa5 Teach the libtool wrapper about the same types of transformations that
the compiler wrapper already knows to do.  This should protect
"-install_name ..." from wrapper transformations within the libtool
wrapper on Darwin and fixes PR pkg/29215.

Software that properly use libtool don't pass an explicit "-install_name
..." because libtool always generates its own such argument when
building the (Darwin) shared library.  However, not every piece of
software, including the ones like lang/tcl that pkgsrc converted to
use libtool, will use libtool in the documented fashion.  Longer term,
those packages should be fixed properly, but we will still need the
libtool wrapper to avoid transforming arguments that the compiler
wrapper itself doesn't transform, e.g. for MIPSpro and -LANG:*.
2005-02-14 21:33:08 +00:00
jlam
a2a889c638 Fix so that we preserve /usr/lib/foo.so on the command line. 2005-01-26 05:03:11 +00:00
cube
07b9c2fded Set argmatch=yes when we transform /some/where/libfoo.so into
-L/some/where -lfoo so that the arguments we push on the stack are actually
used in logic.

Should solve the issue build bash with option 'static' enabled reported on
netbsd-users.

OK'd by jlam@.
2005-01-25 23:27:34 +00:00
tv
443bb330bc Disallow -rdynamic (was being attempted by shells/scsh). 2005-01-24 21:21:45 +00:00
jlam
5977984da2 Split out the argument pre-processing logic into its own script
arg-pp-main, and allow for wrapper-specific hooks to extend the
pre-processing through _WRAP_ARG_PP.<wrappee>.  Move the Darwin
GCC-related preprocessing into arg-pp-darwin-gcc, and create a
arg-pp-mipspro-cc that understands -LANG:<feature> and -LIST:<feature>
so that they're not confused with the usual -Ldir options.
2005-01-18 17:25:13 +00:00
jlam
1cdb69ea24 Teach the wrapper scripts about HP-UX *.sl shared libraries. They
work the same way as ELF *.so shared libraries from pkgsrc's point of
view -- just the extension is different.
2005-01-18 05:24:47 +00:00
jlam
03469252ea Really skip the transformations for imake. This shows the danger in
having variables that take a "yes" value to turn off behavior.
2005-01-11 18:08:20 +00:00