diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index d746c8d0ac67..92931c8401d9 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -1406,32 +1406,25 @@ PKGSRC_COMPILER= mipspro

To bootstrap using icc, assuming the default icc installation directory:

-env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \
-ac_cv___attribute__=yes ./bootstrap
+env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc
       

Note

-

icc 8.1 needs the `-i-static' argument instead of -static-libcxa.

+

For icc 8.0 you must add `LDFLAGS=-static-libcxa' to this.

+

For icc 8.1 you must add `LDFLAGS=-i-static' instead.

+

For icc 10.1 neither of these appears to be necessary.

-

icc supports __attribute__, but the GNU configure test uses a nested - function, which icc does not support. #undef'ing __attribute__ has the - unfortunate side-effect of breaking many of the Linux header files, which - cannot be compiled properly without __attribute__. The test must be - overridden so that __attribute__ is assumed supported by the - compiler.

-

After bootstrapping, you should set PKGSRC_COMPILER - in mk.conf:

+

Use a value for ICCBASE that corresponds to the directory + where icc is installed. After bootstrapping, set + ICCBASE in mk.conf:

-PKGSRC_COMPILER=        icc
-      
-

The default installation directory for icc is - /opt/intel_cc_80, which - is also the pkgsrc default. If you have installed it into a different - directory, set ICCBASE in - mk.conf:

-
-ICCBASE=                /opt/icc
+ICCBASE=                /opt/intel/cc/10.1.008
       
+

The pkgsrc default for ICCBASE is + /opt/intel_cc_80. This is the default + install directory for icc 8.0. If you are using a more recent + version, be sure to set the correct path explicitly. +

pkgsrc uses the static linking method of the runtime libraries provided by icc, so binaries can be run on other systems which do not have the shared libraries installed.

@@ -7552,7 +7545,7 @@ TOOLS_PLATFORM.true?= true # shell builtin

18.4. Questions regarding the tools

-
+
18.4.1. How do I add a new tool?
18.4.2. How do I get a list of all available @@ -7569,7 +7562,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.1.

+

18.4.1.

How do I add a new tool?

@@ -7579,7 +7572,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.2.

+

18.4.2.

How do I get a list of all available tools?

@@ -7590,7 +7583,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.3.

+

18.4.3.

How can I get a list of all the tools that a package is using while being built? I want to know whether it @@ -8075,12 +8068,13 @@ CONFLICTS= Xaw3d-[0-9]* 19.1.10. Handling packages with security problems

When a vulnerability is found, this should be noted in localsrc/security/advisories/pkg-vulnerabilities, - and after committing that file, use make upload - in the same directory to update the file on ftp.NetBSD.org.

+ and after committing that file, ask pkgsrc-security@NetBSD.org to + update the file on ftp.NetBSD.org.

After fixing the vulnerability by a patch, its - PKGREVISION should be increased (this - is of course not necessary if the problem is fixed by using - a newer release of the software).

+ PKGREVISION should be increased (this is of + course not necessary if the problem is fixed by using a newer + release of the software), and the pattern in the + pkg-vulnerabilities file must be updated.

Also, if the fix should be applied to the stable pkgsrc branch, be sure to submit a pullup request!

Binary packages already on ftp.NetBSD.org will be handled @@ -9565,7 +9559,7 @@ place.

and if you still don't have the answer, ask on the pkgsrc-users mailing list.

-
+
22.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS? @@ -9608,7 +9602,7 @@ do? -

22.1.

+

22.1.

What is the difference between MAKEFLAGS, .MAKEFLAGS and @@ -9624,7 +9618,7 @@ do? -

22.2.

+

22.2.

What is the difference between MAKE, GMAKE and @@ -9642,7 +9636,7 @@ do? -

22.3.

+

22.3.

What is the difference between CC, PKG_CC and @@ -9660,7 +9654,7 @@ do? -

22.4.

+

22.4.

What is the difference between BUILDLINK_LDFLAGS, @@ -9673,7 +9667,7 @@ do? -

22.5.

+

22.5.

Why does make show-var VARNAME=BUILDLINK_PREFIX.foo @@ -9689,7 +9683,7 @@ do? -

22.6.

+

22.6.

What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I @@ -9713,7 +9707,7 @@ do? -

22.7.

+

22.7.

Which mailing lists are there for package developers?

@@ -9738,7 +9732,7 @@ do? -

22.8.

+

22.8.

Where is the pkgsrc documentation?

@@ -9786,7 +9780,7 @@ do? -

22.9.

+

22.9.

I have a little time to kill. What shall I do?

diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt index fd23841d60b4..67a4d9b18560 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -1266,31 +1266,26 @@ Compiler). gcc is the default. icc 8.0 and 8.1 on i386 have been tested. To bootstrap using icc, assuming the default icc installation directory: -env CC=/opt/intel_cc_80/bin/icc LDFLAGS=-static-libcxa \ -ac_cv___attribute__=yes ./bootstrap +env ICCBASE=/opt/intel/cc/10.1.008 ./bootstrap --compiler=icc Note -icc 8.1 needs the `-i-static' argument instead of -static-libcxa. +For icc 8.0 you must add `LDFLAGS=-static-libcxa' to this. -icc supports __attribute__, but the GNU configure test uses a nested function, -which icc does not support. #undef'ing __attribute__ has the unfortunate -side-effect of breaking many of the Linux header files, which cannot be -compiled properly without __attribute__. The test must be overridden so that -__attribute__ is assumed supported by the compiler. +For icc 8.1 you must add `LDFLAGS=-i-static' instead. -After bootstrapping, you should set PKGSRC_COMPILER in mk.conf: +For icc 10.1 neither of these appears to be necessary. -PKGSRC_COMPILER= icc +Use a value for ICCBASE that corresponds to the directory where icc is +installed. After bootstrapping, set ICCBASE in mk.conf: + +ICCBASE= /opt/intel/cc/10.1.008 -The default installation directory for icc is /opt/intel_cc_80, which is also -the pkgsrc default. If you have installed it into a different directory, set -ICCBASE in mk.conf: - -ICCBASE= /opt/icc - +The pkgsrc default for ICCBASE is /opt/intel_cc_80. This is the default install +directory for icc 8.0. If you are using a more recent version, be sure to set +the correct path explicitly. pkgsrc uses the static linking method of the runtime libraries provided by icc, so binaries can be run on other systems which do not have the shared libraries @@ -6790,12 +6785,13 @@ option is used. 19.1.10. Handling packages with security problems When a vulnerability is found, this should be noted in localsrc/security/ -advisories/pkg-vulnerabilities, and after committing that file, use make upload -in the same directory to update the file on ftp.NetBSD.org. +advisories/pkg-vulnerabilities, and after committing that file, ask +pkgsrc-security@NetBSD.org to update the file on ftp.NetBSD.org. After fixing the vulnerability by a patch, its PKGREVISION should be increased (this is of course not necessary if the problem is fixed by using a newer -release of the software). +release of the software), and the pattern in the pkg-vulnerabilities file must +be updated. Also, if the fix should be applied to the stable pkgsrc branch, be sure to submit a pullup request!