From: JinWang An Date: Tue, 3 Aug 2021 07:17:09 +0000 (+0900) Subject: Imported Upstream version 3.2.5 X-Git-Tag: upstream/3.2.5^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8aa251ffb153e586cf5b541e22092d26a81490e2;p=platform%2Fupstream%2Fccache.git Imported Upstream version 3.2.5 --- diff --git a/AUTHORS.html b/AUTHORS.html index 66fc0f6..8a2d4e6 100644 --- a/AUTHORS.html +++ b/AUTHORS.html @@ -734,7 +734,7 @@ asciidoc.install(2);
-stats (CCACHE_STATS) [boolean] +stats (CCACHE_STATS or CCACHE_NOSTATS, see Boolean values above)

@@ -1505,7 +1505,7 @@ information.

-unify (CCACHE_UNIFY) [boolean] +unify (CCACHE_UNIFY or CCACHE_NOUNIFY, see Boolean values above)

@@ -2036,38 +2036,36 @@ A modification time of one of the include files is too new (created the same

  • The __TIME__ preprocessor macro is (potentially) being used. ccache - turns off direct mode if “__TIME__” is present in the source code - outside comments and string literals. This is done as a safety measure since - the string indicates that a __TIME__ macro may affect the output. (To - be sure, ccache would have to run the preprocessor, but the sole point of - the direct mode is to avoid that.) If you know that __TIME__ isn’t used - in practise, or don’t care if ccache produces objects where __TIME__ is - expanded to something in the past, you can set sloppiness to - time_macros. + turns off direct mode if “__TIME__” is present in the source code. This + is done as a safety measure since the string indicates that a __TIME__ + macro may affect the output. (To be sure, ccache would have to run the + preprocessor, but the sole point of the direct mode is to avoid that.) If + you know that __TIME__ isn’t used in practise, or don’t care if ccache + produces objects where __TIME__ is expanded to something in the past, + you can set sloppiness to time_macros.

  • The __DATE__ preprocessor macro is (potentially) being used and the date has changed. This is similar to how __TIME__ is handled. If - “__DATE__” is present in the source code outside comments and string - literals, ccache hashes the current date in order to be able to produce the - correct object file if the __DATE__ macro affects the output. If you - know that __DATE__ isn’t used in practise, or don’t care if ccache - produces objects where __DATE__ is expanded to something in the past, - you can set sloppiness to time_macros. + “__DATE__” is present in the source code, ccache hashes the current + date in order to be able to produce the correct object file if the + __DATE__ macro affects the output. If you know that __DATE__ isn’t + used in practise, or don’t care if ccache produces objects where + __DATE__ is expanded to something in the past, you can set sloppiness + to time_macros.

  • The __FILE__ preprocessor macro is (potentially) being used and the - file path has changed. If “__FILE__” is present in the source code - outside comments and string literals, ccache hashes the current input file - path in order to be able to produce the correct object file if the - __FILE__ macro affects the output. If you know that __FILE__ isn’t - used in practise, or don’t care if ccache produces objects where - __FILE__ is expanded to the wrong path, you can set sloppiness to - file_macro. + file path has changed. If “__FILE__” is present in the source code, + ccache hashes the current input file path in order to be able to produce the + correct object file if the __FILE__ macro affects the output. If you + know that __FILE__ isn’t used in practise, or don’t care if ccache + produces objects where __FILE__ is expanded to the wrong path, you can + set sloppiness to file_macro.

    • @@ -2169,9 +2167,9 @@ maintained by Joel Rosdahl. See AUTHORS.txt or AUTHORS.html and
    diff --git a/MANUAL.txt b/MANUAL.txt index d0ee09b..9993019 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -232,7 +232,7 @@ Configuration settings Below is a list of available configuration settings. The corresponding environment variable name is indicated in parentheses after each configuration -setting key. Boolean options are indicated with ``[boolean]'' +setting key. *base_dir* (*CCACHE_BASEDIR*):: @@ -314,7 +314,7 @@ WRAPPERS>>. -- -- -*compression* (*CCACHE_COMPRESS*) [boolean]:: +*compression* (*CCACHE_COMPRESS* or *CCACHE_NOCOMPRESS*, see <<_boolean_values,Boolean values>> above):: If true, ccache will compress object files and other compiler output it puts in the cache. However, this setting has no effect on how files are @@ -336,12 +336,12 @@ WRAPPERS>>. compiled, but that sometimes doesn't work. For example, when using the ``aCC'' compiler on HP-UX, set the cpp extension to *i*. -*direct_mode* (*CCACHE_DIRECT*) [boolean]:: +*direct_mode* (*CCACHE_DIRECT* or *CCACHE_NODIRECT*, see <<_boolean_values,Boolean values>> above):: If true, the direct mode will be used. The default is true. See <<_the_direct_mode,THE DIRECT MODE>>. -*disable* (*CCACHE_DISABLE*) [boolean]:: +*disable* (*CCACHE_DISABLE* or *CCACHE_NODISABLE*, see <<_boolean_values,Boolean values>> above):: When true, ccache will just call the real compiler, bypassing the cache completely. The default is false. @@ -352,7 +352,7 @@ WRAPPERS>>. the hash sum that idetifies the build. The list separator is semicolon on Windows systems and colon on other systems. -*hard_link* (*CCACHE_HARDLINK*) [boolean]:: +*hard_link* (*CCACHE_HARDLINK* or *CCACHE_NOHARDLINK*, see <<_boolean_values,Boolean values>> above):: If true, ccache will attempt to use hard links from the cache directory when creating the compiler output rather than using a file copy. Using hard @@ -363,7 +363,7 @@ WRAPPERS>>. compressed cache files. This means that you should not enable compression if you want to use hard links. The default is false. -*hash_dir* (*CCACHE_HASHDIR*) [boolean]:: +*hash_dir* (*CCACHE_HASHDIR* or *CCACHE_NOHASHDIR*, see <<_boolean_values,Boolean values>> above):: If true, ccache will include the current working directory in the hash that is used to distinguish two compilations. This prevents a problem with the @@ -405,25 +405,25 @@ WRAPPERS>>. <<_using_ccache_with_other_compiler_wrappers,USING CCACHE WITH OTHER COMPILER WRAPPERS>>. -*read_only* (*CCACHE_READONLY*) [boolean]:: +*read_only* (*CCACHE_READONLY* or *CCACHE_NOREADONLY*, see <<_boolean_values,Boolean values>> above):: If true, ccache will attempt to use existing cached object files, but it will not to try to add anything new to the cache. If you are using this because your ccache directory is read-only, then you need to set *temporary_dir* as otherwise ccache will fail to create temporary files. -*read_only_direct* (*CCACHE_READONLY_DIRECT*) [boolean]:: +*read_only_direct* (*CCACHE_READONLY_DIRECT* or *CCACHE_NOREADONLY_DIRECT*, see <<_boolean_values,Boolean values>> above):: Just like *read_only* except that ccache will only try to retrieve results from the cache using the direct mode, not the preprocessor mode. See documentation for *read_only* regarding using a read-only ccache directory. -*recache* (*CCACHE_RECACHE*) [boolean]:: +*recache* (*CCACHE_RECACHE* or *CCACHE_NORECACHE*, see <<_boolean_values,Boolean values>> above):: If true, ccache will not use any previously stored result. New results will still be cached, possibly overwriting any pre-existing results. -*run_second_cpp* (*CCACHE_CPP2*) [boolean]:: +*run_second_cpp* (*CCACHE_CPP2* or *CCACHE_NOCPP2*, see <<_boolean_values,Boolean values>> above):: If true, ccache will not use the optimisation of avoiding the second call to the preprocessor by compiling the preprocessed output that was used for @@ -463,7 +463,7 @@ WRAPPERS>>. See the discussion under <<_troubleshooting,TROUBLESHOOTING>> for more information. -*stats* (*CCACHE_STATS*) [boolean]:: +*stats* (*CCACHE_STATS* or *CCACHE_NOSTATS*, see <<_boolean_values,Boolean values>> above):: If true, ccache will update the statistics counters on each compilation. The default is true. @@ -484,7 +484,7 @@ NOTE: In previous versions of ccache, *CCACHE_TEMPDIR* had to be on the same with other users. Note that this also affects the file permissions set on the object files created from your compilations. -*unify* (*CCACHE_UNIFY*) [boolean]:: +*unify* (*CCACHE_UNIFY* or *CCACHE_NOUNIFY*, see <<_boolean_values,Boolean values>> above):: If true, ccache will use a C/C++ unifier when hashing the preprocessor output if the *-g* option is not used. The unifier is slower than a normal @@ -816,30 +816,28 @@ problems and what may be done to increase the hit rate: output, which contains data from the old header file; the wrong object file is stored in the cache.) ** The *\_\_TIME\__* preprocessor macro is (potentially) being used. ccache - turns off direct mode if ``\_\_TIME\__'' is present in the source code - outside comments and string literals. This is done as a safety measure since - the string indicates that a *\_\_TIME\__* macro _may_ affect the output. (To - be sure, ccache would have to run the preprocessor, but the sole point of - the direct mode is to avoid that.) If you know that *\_\_TIME\__* isn't used - in practise, or don't care if ccache produces objects where *\_\_TIME__* is - expanded to something in the past, you can set *sloppiness* to - *time_macros*. + turns off direct mode if ``\_\_TIME\__'' is present in the source code. This + is done as a safety measure since the string indicates that a *\_\_TIME\__* + macro _may_ affect the output. (To be sure, ccache would have to run the + preprocessor, but the sole point of the direct mode is to avoid that.) If + you know that *\_\_TIME\__* isn't used in practise, or don't care if ccache + produces objects where *\_\_TIME__* is expanded to something in the past, + you can set *sloppiness* to *time_macros*. ** The *\_\_DATE\__* preprocessor macro is (potentially) being used and the date has changed. This is similar to how *\_\_TIME\__* is handled. If - ``\_\_DATE\__'' is present in the source code outside comments and string - literals, ccache hashes the current date in order to be able to produce the - correct object file if the *\_\_DATE\__* macro affects the output. If you - know that *\_\_DATE\__* isn't used in practise, or don't care if ccache - produces objects where *\_\_DATE__* is expanded to something in the past, - you can set *sloppiness* to *time_macros*. -** The *\_\_FILE\__* preprocessor macro is (potentially) being used and the - file path has changed. If ``\_\_FILE\__'' is present in the source code - outside comments and string literals, ccache hashes the current input file - path in order to be able to produce the correct object file if the - *\_\_FILE\__* macro affects the output. If you know that *\_\_FILE\__* isn't + ``\_\_DATE\__'' is present in the source code, ccache hashes the current + date in order to be able to produce the correct object file if the + *\_\_DATE\__* macro affects the output. If you know that *\_\_DATE\__* isn't used in practise, or don't care if ccache produces objects where - *\_\_FILE__* is expanded to the wrong path, you can set *sloppiness* to - *file_macro*. + *\_\_DATE__* is expanded to something in the past, you can set *sloppiness* + to *time_macros*. +** The *\_\_FILE\__* preprocessor macro is (potentially) being used and the + file path has changed. If ``\_\_FILE\__'' is present in the source code, + ccache hashes the current input file path in order to be able to produce the + correct object file if the *\_\_FILE\__* macro affects the output. If you + know that *\_\_FILE\__* isn't used in practise, or don't care if ccache + produces objects where *\_\_FILE__* is expanded to the wrong path, you can + set *sloppiness* to *file_macro*. * If ``cache miss'' has been incremented even though the same code has been compiled and cached before, ccache has either detected that something has changed anyway or a cleanup has been performed (either explicitly or diff --git a/Makefile.in b/Makefile.in index 30beb2b..d474f2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,11 +22,32 @@ all_cflags = $(CFLAGS) all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS) extra_libs = @extra_libs@ -base_sources = \ - ccache.c mdfour.c hash.c execute.c util.c args.c stats.c version.c \ - cleanup.c snprintf.c unify.c manifest.c hashtable.c hashtable_itr.c \ - murmurhashneutral2.c hashutil.c getopt_long.c exitfn.c lockfile.c \ - counters.c language.c compopt.c conf.c +non_3pp_sources = \ + args.c \ + ccache.c \ + cleanup.c \ + compopt.c \ + conf.c \ + counters.c \ + execute.c \ + exitfn.c \ + hash.c \ + hashutil.c \ + language.c \ + lockfile.c \ + manifest.c \ + mdfour.c \ + stats.c \ + unify.c \ + util.c \ + version.c +3pp_sources = \ + getopt_long.c \ + hashtable.c \ + hashtable_itr.c \ + murmurhashneutral2.c \ + snprintf.c +base_sources = $(non_3pp_sources) $(3pp_sources) base_objs = $(base_sources:.c=.o) ccache_sources = main.c $(base_sources) @@ -55,7 +76,7 @@ ccache$(EXEEXT): $(ccache_objs) $(extra_libs) $(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS) .PHONY: install -install: all +install: all $(srcdir)/ccache.1 $(installcmd) -d $(DESTDIR)$(bindir) $(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir) $(installcmd) -d $(DESTDIR)$(mandir)/man1 diff --git a/NEWS.html b/NEWS.html index 7bd6950..9f16a1c 100644 --- a/NEWS.html +++ b/NEWS.html @@ -734,7 +734,7 @@ asciidoc.install(2);