[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2318: no code changes - strip trailing whitespace and update manpage
Mats Wichmann
mats at linuxfoundation.org
Sat Aug 20 15:00:17 UTC 2016
------------------------------------------------------------
revno: 2318
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2016-05-17 07:44:05 -0600
message:
no code changes - strip trailing whitespace and update manpage
modified:
lsbdev-cc/lsbcc.1.in
lsbdev-cc/lsbcc.c
lsbdev-cc/lsbcpp.c
package/Makefile
-------------- next part --------------
=== modified file 'lsbdev-cc/lsbcc.1.in'
--- a/lsbdev-cc/lsbcc.1.in 2014-07-28 16:52:05 +0000
+++ b/lsbdev-cc/lsbcc.1.in 2016-05-17 13:44:05 +0000
@@ -1,6 +1,6 @@
.TH lsbcc "1" "" "lsbcc (LSB)" LSB
.SH NAME
-lsbcc, lsbc++, lsbcpp \- compiler driver for building LSB conforming applications
+lsbcc, lsbc++, lsbcpp \- compiler helper for building LSB conforming applications
.SH SYNOPSIS
.B lsbcc
.RI [ lsbcc-options ]
@@ -15,36 +15,39 @@
.RI [ compiler-options ]
.SH DESCRIPTION
.P
-This tool should be used in place of the
+This tool should be used in place of the corresponding
.I cc, c++
or
-.IR cpp
-command when
-building an LSB-conforming program.
+.IR cpp
+command when building an LSB-conforming program.
.P
LSB-conforming programs must link dynamically only with
LSB-required and application-supplied shared libraries,
as no other libraries can be guaranteed to be present on
-an LSB-compliant system. They must only use specified
-interfaces from LSB-required shared libraries.
-LSB programs also need to be linked with
+an LSB-compliant system. Additionally, they must only use specified
+interfaces and symbol versions from LSB-required shared libraries,
+as the compatibility promise only extended to what is included
+in the LSB specification.
+LSB programs also need to be linked with
a special program interpreter which identifies
them as LSB conforming.
.P
The LSB development environment provides
-a set of replacement system headers and
+a set of replacement system headers and
stub dynamic libraries.
These headers and libraries have been
carefully built so that they contain only the interfaces
specified in the LSB. When the stub libraries are
used for link-time symbol resolution, the use of
unspecified interfaces in those libraries will
-result in link failures.
+result in link failures. In effect, these files are
+a "trick" which controls the scope of the compilation
+environment, rather than making any actual changed.
.P
.I lsbcc
is designed to apply the LSB build conventions with a
minimum of changes to existing build setups.
-When invoked as the compiler,
+When invoked as the compiler,
it first modifies the command line to follow the
LSB build conventions, then passes the resulting
command line on to the regular compiler, so
@@ -53,93 +56,94 @@
.P
.IR lsbcc
takes a number of options prefixed with --lsb-, or
-alternatively;
-behavior other than the default can be controlled
+alternatively, behavior other than the default can be controlled
by a set of environment variables. Typically command
line options will override options set through environment
variables.
.P
.SH LSBCC OPTIONS
-.TP
+.TP
--lsb-help
-Display help message. The compiler
-.I --help
-option will also display the output from --lsb-help.
-.TP
+Display help message just for lsbcc. The compiler
+.I --help
+option is intercepted and also displays the output from --lsb-help
+in addition to the compiler's own help message.
+.TP
--lsb-version
-Display the LSB versions this tool can build against
-(that is, valid arguments for --lsb-target-version).
+Display the LSB versions the tool can build against
+(that is, show valid arguments for --lsb-target-version).
The default version is listed first.
-The output string can be parsed: the default
-version is the last word before the semicolon,
-while the comma-separated version list is the
-last word (and comes after the semicolon).
-.TP
+The output string can be parsed by other tools. It begins
+with the words "LSB version", followed by the default
+version number and a semicolon. Next is the word "supports",
+then the entire list of supported versions is presented as
+a single comma-separated word.
+.TP
--lsb-verbose
The complete command line passed to either the C or C++ compiler
will be printed to stderr just prior to execution. This helps
-see the effects of
-.I lsbcc
+see the effects of
+.I lsbcc
and options.
-.TP
+.TP
--lsb-cc=<path to c compiler>
Specifies the name of the C compiler to invoke with the modified
argument list. If this option or the LSBCC environment
-variable is not set, the default
+variable is not set, the default
.I cc
will be used. This setting overrides the LSBCC environment setting.
-.TP
+.TP
--lsb-cxx=<path to c++ compiler>
Specifies the name of the C++ compiler to invoke with the modified
argument list. If this option or the LSBCCX environment
-variable is not set, the default
+variable is not set, the default
.I c++
will be used. This setting overrides the LSBCXX environment setting.
.TP
--lsb-cpp=<path to c preprocessor>
Specifies the name of the C preprocessor to invoke with the modified
argument list. If this option or the LSBCPP environment
-variable is not set, the default
+variable is not set, the default
.I cpp
will be used. This option overrides the LSBCPP environment setting.
-.TP
+.TP
--lsb-forcefeatures
-This causes
-.I lsbcc
-to insert macro defines for all of the
+This causes
+.I lsbcc
+to insert macro defines for all of the
interface features it supports (e.g. -DHAVE_BSD, -DHAVE_GNU...).
These macros are not needed for the LSB headers but may
select necessary behavior in non-LSB headers that have
conditionals. However, predefining the macros may collide with
application definitions of the macros, so this is no longer
-the default behavior for
+the default behavior for
.IR lsbcc .
-.TP
+.TP
--lsb-libpath=<lsb_lib_path>
Specifies the location of the LSB stub libraries that will
be linked against. If this option or the LSBCC_LIBS environment
-variable is not set, the default
+variable is not set, the default
.I /opt/lsb/lib
will be used. This option overrides the LSBCC_LIBS environment setting.
-.TP
+.TP
--lsb-includepath=<include_path>
Specifies the location of the LSB header files that will
be linked against. If this option or the LSBCC_INCLUDES environment
-variable is not set, the default
+variable is not set, the default
.I /opt/lsb/include
will be used. This option overrides the LSBCC_INCLUDES environment setting.
-.TP
+.TP
--lsb-cxx-includepath=<include_path>
Specifies the location of the LSB header files that will
be linked against. If this option or the LSBCXX_INCLUDES environment
-variable is not set, the default
+variable is not set, the default
.I /opt/lsb/include
will be used. This option overrides the LSBCXX_INCLUDES environment setting.
-.TP
+.TP
--lsb-shared-libs=<shared_lib:...>
This option adds libraries to the list of non-lsb libraries to link as
-shared libraries (such as product internal shared libraries).
+shared libraries (such as product internal shared libraries).
A library name or colon-separated list of library names to
add to the default list. The name should be the base part
of the library only, for example to add
@@ -155,9 +159,9 @@
as shared libraries.
Paths specified by this option are appended to the list specified
by the LSBCC_SHAREDLIBPATH environment variable, if any.
-.TP
+.TP
--lsb-modules=<module,..>
-Enable support for the optional/trial-use LSB modules listed.
+Enable support for the optional/trial-use LSB modules listed.
Modules specified by this option are appended to the list specified
by the LSB_MODULES environment variable, if any. For a list of modules
supported in any LSB version, use 'lsbcc --lsb-target-version=ver --help'
@@ -170,22 +174,22 @@
This will unset the dynamic linker (like --lsb-use-default-linker),
but will also link in code that tries to use the LSB dynamic linker if
needed.
-.TP
+.TP
--lsb-target-version=<LSB_version>
Set the version of LSB to build for.
-For the list of valid values, call
+For the list of valid values, call
.I lsbcc
with the
-.I --lsb-version
-option. If set to a valid value,
-this option overrides the LSBCC_LSBVERSION environment variable.
+.I --lsb-version
+option. If set to a valid value,
+this option overrides the LSBCC_LSBVERSION environment variable.
If neither are set, the default
.I '@DEFAULT_LSB_VERSION@'
will be used.
-.TP
+.TP
--lsbcc-version
Print the version of this program, and quit.
-.TP
+.TP
--lsb-libtool_fixups
Enable semantics that assist in compiling applications with
.I lsbcc
@@ -195,11 +199,10 @@
to the compiler rather than as -l arguments.
.I lsbcc
needs to evaluate all shared libraries to determine if they should be linked
-shared or statically,
-.I lsbcc
-does this by analyzing -l arguments. This option
-causes
-.I lsbcc
+shared or statically,
+.I lsbcc
+does this by analyzing -l arguments. This option causes
+.I lsbcc
to evaluate all files on the command line to determine if they are
shared libraries and to re-write shared libraries found in terms of -L and -l
either as shared or static depending upon if the library is in the list of
@@ -211,7 +214,7 @@
.P
.SH ENVIRONMENT
The following environment variables affect the behavior of
-.I lsbcc
+.I lsbcc
and
.IR lsbc++ .
Not all apply to
@@ -220,7 +223,7 @@
LSBCC
Specifies the name of the C compiler to invoke with the modified
argument set. If this environment variable is not found,
-the default
+the default
.I cc
will be used. (Not for
.IR lsbcpp ).
@@ -228,7 +231,7 @@
LSBCXX
Specifies the name of the C++ compiler to invoke with the modified
argument set. If this environment variable is not found,
-the default
+the default
.I c++
will be used. (Not for
.IR lsbcpp ).
@@ -238,14 +241,14 @@
argument set. If this environment variable is not found, the default
.I cpp
will be used
-.RI ( lsbcpp
+.RI ( lsbcpp
only).
.P
.TP
LSBCC_LIBS
Specifies the location of the LSB stub libraries that will
be linked against. If this environment variable is not found,
-the default
+the default
.I /opt/lsb/lib
will be used (or /opt/lsb/lib64 on certain 64-bit architectures).
.P
@@ -253,7 +256,7 @@
LSBCC_INCLUDES
Specifies the location of the LSB header files that will
be linked against. If this environment variable is not found,
-the default
+the default
.I /opt/lsb/include
will be used.
.P
@@ -261,7 +264,7 @@
LSBCXX_INCLUDES
Specifies the location of the LSB C++ header files that will
be linked against. If this environment variable is not found,
-the default
+the default
.I /opt/lsb/include/c++
will be used.
.P
@@ -282,21 +285,21 @@
.TP
LSB_MODULES
Specify which optional/trial-use LSB modules to include interfaces for.
-For a list of modules supported in any LSB version,
+For a list of modules supported in any LSB version,
use 'lsbcc --lsb-target-version=ver --help'.
.TP
LSBCC_FORCEFEATURES
-This causes
-.I lsbcc
-to insert macro defines for all of the
+This causes
+.I lsbcc
+to insert macro defines for all of the
interface features it supports (e.g. -DHAVE_BSD, -DHAVE_GNU...).
This can be helpful in some situations and was formerly
-the default behavior for
-.IR lsbcc ,
+the default behavior for
+.IR lsbcc ,
but also can collide with feature macro definitions from other sources,
-so is no longer the default behavior for
+so is no longer the default behavior for
.IR lsbcc .
-.TP
+.TP
LSBCC_LIBTOOLFIXUPS
Enable semantics that assist in compiling applications with
.I lsbcc
@@ -306,11 +309,11 @@
to the compiler rather than as -l arguments.
.I lsbcc
needs to evaluate all shared libraries to determine if they should be linked
-shared or statically,
-.I lsbcc
-does this by analyzing -l arguments. This option
-causes
-.I lsbcc
+shared or statically,
+.I lsbcc
+does this by analyzing -l arguments. This option
+causes
+.I lsbcc
to evaluate all files on the command line to determine if they are
shared libraries and to re-write shared libraries found in terms of -L and -l
either as shared or static depending upon if the library is in the list of
@@ -355,8 +358,8 @@
LSBCC_VERBOSE
The complete command line passed to either the C or C++ compiler
will be printed to stderr just prior to execution. This helps
-see the effects of
-.I lsbcc
+see the effects of
+.I lsbcc
and options.
.P
.TP
@@ -378,15 +381,15 @@
rule of forcing static linking. The application may not depend
on such a library being present on a system, so it must either
be shipped with the application, or with another LSB conforming
-application on which this application depends.
+application on which this application depends.
.P
-Libs added with any of these options will be cumulative. Shared
-libs added with command line options must appear on the command
+Libs added with any of these options will be cumulative. Shared
+libs added with command line options must appear on the command
line before any -l options to have effect.
-.TP
+.TP
--lsb-shared-libs=<shared_lib:...>
This option adds libraries to the list of non-lsb libraries to link as
-shared libraries (such as product internal shared libraries).
+shared libraries (such as product internal shared libraries).
A library name or colon-separated list of library names to
add to the default list. The name should be the base part
of the library only, for example to add
@@ -428,15 +431,15 @@
.SH "BUGS"
.P
It is possible to confuse the automatic library processing of
-.I lsbcc (and
+.I lsbcc (and
.IR lsbc++ ).
In particular, build systems that include "clever" tools
-to manage which libraries to use, such as GNU
+to manage which libraries to use, such as GNU
.I libtool
-and
-.IR pkgconfig ,
+and
+.IR pkgconfig ,
may defeat the checks for non-LSB libraries
-by silently supplying full pathnames instead of the
+by silently supplying full pathnames instead of the
.BI -l lib
form.
.SH FILES
@@ -446,7 +449,7 @@
.TP
/opt/lsb/lib
the LSB stub libraries. To be more precise, these will appear
-as a set of directories
+as a set of directories
.IR /opt/lsb/lib-3.0 ,
.IR /opt/lsb/lib-3.1 ,
and so on, for each supported version and
@@ -485,7 +488,7 @@
.IR lsb-build-cc .
If this package is used, the support package
.I lsb-build-base
-must also be installed;
+must also be installed;
.I lsb-build-desktop
is optional but would normally be used.
.P
@@ -495,7 +498,7 @@
from a different source than the base headers,
and may be under a separate license as well.
.\" .P
-.\" lsbcc will add
+.\" lsbcc will add
.\" .I -Wl,--as-needed
'\" to all compiler commands that will invoke the linker. This option causes
'\" the linker to only include explicit dependencies on shared libraries
@@ -506,10 +509,10 @@
'\" not also referenced by the objects being linked. This is no longer
'\" necessary and this option reduces the number of direct run-time shared
'\" library dependencies. If either
-.\" .I -Wl,--as-needed
-.\" or
-.\" .I -Wl,--no-as-needed
-.\" are passed in the compiler options to lsbcc, lsbcc will not insert
+.\" .I -Wl,--as-needed
+.\" or
+.\" .I -Wl,--no-as-needed
+.\" are passed in the compiler options to lsbcc, lsbcc will not insert
.\" -IR -Wl,--as-needed .
.\" See the
.\" .BI ld
=== modified file 'lsbdev-cc/lsbcc.c'
--- a/lsbdev-cc/lsbcc.c 2016-05-03 21:52:49 +0000
+++ b/lsbdev-cc/lsbcc.c 2016-05-17 13:44:05 +0000
@@ -7,17 +7,17 @@
* under the terms of the BSD license.
*/
/*
- * This is the lsbcc wrapper (which can also be known as lsbc++).
+ * This is the lsbcc wrapper (which can also be known as lsbc++).
* It is used to aid in building LSB conforming applications.
* LSB conforming applications can be built without this tool, but using
- * lsbcc make it easier to get everything right.
+ * lsbcc make it easier to get everything right.
* This is a re-implementation of the original shell script.
*
* The basic premise is this: The LSB development environment provides
- * a set of headers and libraries found in /opt/lsb/include and
+ * a set of headers and libraries found in /opt/lsb/include and
* /opt/lsb/lib respectively (configurable). These headers and libraries have
- * been carefully constructed so that they contain only the interfaces
- * provided by the LSB. An LSB conforming application must also be linked
+ * been carefully constructed so that they contain only the interfaces
+ * provided by the LSB. An LSB conforming application must also be linked
* with a special program intepreter, usually ld-lsb.so.3 but the name
* is defined in each LSB architecture supplement). lsbcc arranges the
* task of including these headers and link-editing against these libraries
@@ -30,11 +30,11 @@
* inserting a couple of extra options in the right place before actually
* calling gcc (or other specified native compiler).
*
- * The approach is to recognize enough of the regular options to allow the
+ * The approach is to recognize enough of the regular options to allow the
* extra options to be inserted into the right place. Fortunately,
* the options can be grouped into a few categories, and the order in which
* the categories are passed to gcc is not important, as long as the order of
- * items within each category is preserved. The extra options are easily
+ * items within each category is preserved. The extra options are easily
* inserted in between the categories.
*
* NOTE: the above claim turns out to be a lie; there are known
@@ -46,10 +46,10 @@
* The solution unfortunately appears to involve yet another rewrite,
* which nobody has had time to do.
*
- * There are some problems that complicate this process (and this is what
- * ended the life of the shell script-based lsbcc). For one, some of the
- * options have optional parameters (i.e. -W and -O) and the getopt command
- * wasn't able to communicate this to the rest of the shell script. Another
+ * There are some problems that complicate this process (and this is what
+ * ended the life of the shell script-based lsbcc). For one, some of the
+ * options have optional parameters (i.e. -W and -O) and the getopt command
+ * wasn't able to communicate this to the rest of the shell script. Another
* is that when strings are passed in as a define (ie -DFOO="A String Here"),
* the quotes were getting stripped off, so what got passed to gcc was a bunch
* of invalid options.
@@ -129,7 +129,7 @@
int lsbcc_buildingshared = 0;
/*
- * State variables to determine if we need to add -Wl,-Bdynamic / -Wl,-Bstatic
+ * State variables to determine if we need to add -Wl,-Bdynamic / -Wl,-Bstatic
* before a library
* b_dynamic tracks the mode we're currently in
* b_dynamic_req, b_static_req track requests to change mode
@@ -185,7 +185,7 @@
/*
* If the library is in the LSB list (note this includes libraries
- * marked for dynamic linking by command-line args), make sure it's
+ * marked for dynamic linking by command-line args), make sure it's
* dynamically linked. If there's a pending argument to go into
* dynamic or static linking mode we honor it.
*/
@@ -198,7 +198,7 @@
* sane usage but did not stand up to apparently insane usage:
* bug 4034 notes autotools may emit empty Bstatic/Bdynamic pairs.
* This failed when the second state change arg is seen while
- * the first is still pending, the conditions are not right to do
+ * the first is still pending, the conditions are not right to do
* anything with the second request.
*
* Now we add b_static_req and the algorithm is simply to act
@@ -236,7 +236,7 @@
}
}
- /*
+ /*
* If we've fallen through, this is a non-LSB library
* Check if we need to emit the whole-archive flag
* and make sure the library is statically linked
@@ -515,7 +515,7 @@
int need_stack_prot_suppression()
{
- /*
+ /*
* If we don't need the gcc 3.4 workaround, we don't need this.
* This also conveniently loads the gcc version for us.
*/
@@ -526,7 +526,7 @@
if (strcmp(lsbcc_lsbversion, "4.0") >= 0)
return 0;
- /*
+ /*
* If we're here, we know we're running a gcc 4.x version.
* Check the minor version number in this case.
* Add: running 4.x or 5.x
@@ -547,7 +547,7 @@
case '7':
case '8':
case '9':
- /*
+ /*
* pretty much need it for all newer versions of 4.x, though here
* we hedge our bets and only test for known gcc versions.
* There's usually some other issue anyway (usually c++)
@@ -558,11 +558,11 @@
default:
/*
- * Some other value we don't recognize.
+ * Some other value we don't recognize.
* Following the previous pattern, assume we need it here.
*
- * Bug 3816 comment #4 notes that it breaks autoconf scripts if
- * "lsbcc -E" writes to stderr. Since we're trying to let untested
+ * Bug 3816 comment #4 notes that it breaks autoconf scripts if
+ * "lsbcc -E" writes to stderr. Since we're trying to let untested
* new versions still work, avoid doing this in the preprocessor case.
*/
if (! cpp_only)
@@ -616,7 +616,7 @@
if (strcmp(lsbcc_lsbversion, "4.0") >= 0)
return 0;
- /*
+ /*
* If we don't need the gcc 3.4 workaround, we don't need this.
* This also conveniently loads the gcc version for us.
*/
@@ -636,7 +636,7 @@
case '4':
case '5':
case '6':
- /*
+ /*
* pretty much need it for all newer versions of 4.x, though here
* we hedge our bets and only test for known gcc versions.
* There's usually some other issue anyway (usually c++)
@@ -645,7 +645,7 @@
default:
/*
- * Some other value we don't recognize.
+ * Some other value we don't recognize.
* Following the previous pattern, assume we need it here.
*/
fprintf(stderr, "unrecognized gcc version: \"%s\"\n", gccversion);
@@ -768,7 +768,7 @@
};
/*
- * return string of available optional/trial-use module names for
+ * return string of available optional/trial-use module names for
* the target LSB version, or "None"
* Used only for the usage message at the moment
* Side effect: memory is allocated for the string
@@ -917,8 +917,8 @@
* Returns the number of directory entries selected or -1 if an error occurs
*
* FIXME: If LSB adds scandir, drop this code.
- * UPDATE: as described in bug 1997, scandir was added @LSB 4.0, but LSB
- * builds lsbcc "pessimistically" (targeting oldest possible LSB version),
+ * UPDATE: as described in bug 1997, scandir was added @LSB 4.0, but LSB
+ * builds lsbcc "pessimistically" (targeting oldest possible LSB version),
* so this needs to remain.
*/
int lsbcc_scandir(const char *dir,
@@ -936,12 +936,12 @@
if ((dirp = opendir(dir)) == NULL)
return -1;
while ((tmpent = readdir(dirp)) != NULL) {
- if (!sel(tmpent))
+ if (!sel(tmpent))
continue;
if (num_ents == ents_available) {
/* grow the return array buffer in 1k chunks as needed */
- *namelist = realloc(*namelist, 1024 +
- ents_available * sizeof(struct dirent*));
+ *namelist = realloc(*namelist,
+ 1024 + ents_available * sizeof(struct dirent*));
ents_available += 1024 / sizeof(struct dirent*);
}
@@ -987,13 +987,13 @@
while (num_libs--) {
/*
* The filter is_file_so() selects only names which match
- * a pattern which includes starting with "lib" and
+ * a pattern which includes starting with "lib" and
* containing a ".so" somewhere after that (e.g.
* libfoo.so.1.37 is a match, as is libfoo.so).
- * Unfortunately, this is too complex for external scanning
- * tools, so for example Coverity flags this as a
- * high-priority defect, due to dereferencing null pointer
- * if the strstr returns NULL - which we know can't happen
+ * Unfortunately, this is too complex for external scanning
+ * tools, so for example Coverity flags this as a
+ * high-priority defect, due to dereferencing null pointer
+ * if the strstr returns NULL - which we know can't happen
* because of is_file_so.
*/
char *libstr =
@@ -1281,8 +1281,8 @@
}
/*
- * FIXME temporary hack: just accept names of deprecated modules -
- * no need to do anything with them. This is just for the Qt3
+ * FIXME temporary hack: just accept names of deprecated modules -
+ * no need to do anything with them. This is just for the Qt3
* scripts until a better answer is developed
*/
for (i = 0; i < lsb_num_deprecated_modules[lsbversion_index];
@@ -1297,7 +1297,7 @@
}
/*
- * If the module has just been withdrawn,
+ * If the module has just been withdrawn,
* print a warning instead of an error.
*/
if (!found) {
@@ -1553,12 +1553,12 @@
(strstr(argv[optind - 1], "whole-archive") != NULL)) {
/*
* Tricky case. If an archive is being specified by name
- * as libname.a, it is "unrecognized" and will go on the
- * "options" list. It if it being specified by way of
- * -lname, then is will be recognized as a library and go
- * on the "userlibs" list. The problem is, whole-archive
+ * as libname.a, it is "unrecognized" and will go on the
+ * "options" list. It if it being specified by way of
+ * -lname, then is will be recognized as a library and go
+ * on the "userlibs" list. The problem is, whole-archive
* has to stay together with the archive it applies to,
- * but we haven't gotten to the library argument(s) yet,
+ * but we haven't gotten to the library argument(s) yet,
* so we don't know where to put this. We have to solve
* this by deferring processing.
*/
@@ -1635,7 +1635,7 @@
/* no -Wl,Bdynamic, add -Wl,--start-group, add -lgcc_eh */
found_gcc_arg = 1;
b_dynamic = 0;
-
+
force_static = 1;
if (lsbcc_debug & DEBUG_RECOGNIZED_ARGS)
fprintf(stderr, "option: -%s\n",
@@ -1661,8 +1661,8 @@
case '?':
if (strncmp(argv[optind_old], "--lsb-", 6) == 0) {
/*
- * Refuse to pass unrecognized --lsb- prefixed options
- * along to the real compiler. Likely just typos of
+ * Refuse to pass unrecognized --lsb- prefixed options
+ * along to the real compiler. Likely just typos of
* legitmate --lsb- options.
* No chance compiler would recognize anyway.
*/
@@ -1690,7 +1690,7 @@
default:
/* the option from 100-200 range, copy argument after it */
if (c >= COPY_ARG_START && c < COPY_ARG_END) {
- /*
+ /*
* In this case the next argument from command line is
* immediately appended to the option list.
*/
@@ -1757,7 +1757,7 @@
*/
for (i = 0; lsb_version_include_paths[lsbversion_index][i] != NULL; i++) {
if (lsbcc_debug & DEBUG_INCLUDE_CHANGES)
- fprintf(stderr, "Prepending %s to system include path\n",
+ fprintf(stderr, "Prepending %s to system include path\n",
lsb_version_include_paths[lsbversion_index][i]);
argvadd(incpaths, "I", lsb_version_include_paths[lsbversion_index][i]);
}
@@ -2050,7 +2050,7 @@
argvappend(gccargs, proginterp);
}
- /*
+ /*
* bug 4161: don't add syslibs if linking a shared library
* we do need libc_nonshared, though. Maybe also pthread_nonshared?
*/
=== modified file 'lsbdev-cc/lsbcpp.c'
--- a/lsbdev-cc/lsbcpp.c 2016-04-16 20:38:36 +0000
+++ b/lsbdev-cc/lsbcpp.c 2016-05-17 13:44:05 +0000
@@ -72,7 +72,7 @@
* Variable to store optind value - we'll have to process command line twice.
*/
int optind_old;
-
+
/* TODO XXX
* The code to add per-LSB-version include paths that was added
* to lsbcc.c should probably be ported over to lsbcpp.c
@@ -178,8 +178,8 @@
/*
* figure out if the user has requested a change to the target LSB vers.
- * In lsbcc, this has to happen first because it may affect other
- * constructions like library paths. In lsbcpp this should not be a
+ * In lsbcc, this has to happen first because it may affect other
+ * constructions like library paths. In lsbcpp this should not be a
* problem, but it seems easier to keep the order in sync between the two.
*/
if ((ptr = getenv("LSBCC_LSBVERSION")) != NULL) {
@@ -361,8 +361,8 @@
case '?':
if (strncmp(argv[optind - 1], "--lsb-", 6) == 0) {
/*
- * Refuse to pass unrecognized --lsb- prefixed options
- * along to the real compiler. Likely just typos of
+ * Refuse to pass unrecognized --lsb- prefixed options
+ * along to the real compiler. Likely just typos of
* legitmate --lsb- options.
* No chance compiler would recognize anyway.
*/
=== modified file 'package/Makefile'
--- a/package/Makefile 2016-05-03 21:52:49 +0000
+++ b/package/Makefile 2016-05-17 13:44:05 +0000
@@ -54,7 +54,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-BUILDNO=9
+BUILDNO=10
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list