rpms/ccache/devel 06_md.diff, NONE, 1.1 ccache.spec, 1.24, 1.25 ccache-2.4-md.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Mon Aug 10 17:43:51 UTC 2009
- Previous message (by thread): rpms/python-tw-jquery/EL-5 python-tw-jquery.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/pytrainer/devel .cvsignore, 1.5, 1.6 pytrainer.spec, 1.14, 1.15 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2683
Modified Files:
ccache.spec
Added Files:
06_md.diff
Removed Files:
ccache-2.4-md.patch
Log Message:
* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-16
- Switch #438201 patch URL to Debian patch tracking (original is MIA).
06_md.diff:
ccache.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
--- NEW FILE 06_md.diff ---
diff --git a/ccache.c b/ccache.c
index 64c979b..843929f 100644
--- a/ccache.c
+++ b/ccache.c
@@ -647,6 +647,13 @@ static void process_args(int argc, char **argv)
int found_S_opt = 0;
struct stat st;
char *e;
+ /* is gcc being asked to output dependencies? */
+ int generating_dependencies = 0;
+ /* is the dependency makefile name overridden with -MF? */
+ int dependency_filename_specified = 0;
+ /* is the dependency makefile target name specified with -MQ or -MF? */
+ int dependency_target_specified = 0;
+
stripped_args = args_init(0, NULL);
@@ -725,6 +732,18 @@ static void process_args(int argc, char **argv)
continue;
}
+ /* These options require special handling, because they
+ behave differently with gcc -E, when the output
+ file is not specified. */
+
+ if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
+ generating_dependencies = 1;
+ } else if (strcmp(argv[i], "-MF") == 0) {
+ dependency_filename_specified = 1;
+ } else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
+ dependency_target_specified = 1;
+ }
+
/* options that take an argument */
{
const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
@@ -837,6 +856,41 @@ static void process_args(int argc, char **argv)
p[2] = 0;
}
+ /* If dependencies are generated, configure the preprocessor */
+
+ if (generating_dependencies && output_file) {
+ if (!dependency_filename_specified) {
+ char *default_depfile_name = x_strdup(output_file);
+ char *p = strrchr(default_depfile_name, '.');
+
+ if (p) {
+ if (strlen(p) < 2) {
+ stats_update(STATS_ARGS);
+ failed();
+ return;
+ }
+ *p = 0;
+ }
+ else {
+ int len = p - default_depfile_name;
+
+ p = x_malloc(len + 3);
+ strncpy(default_depfile_name, p, len - 1);
+ free(default_depfile_name);
+ default_depfile_name = p;
+ }
+
+ strcat(default_depfile_name, ".d");
+ args_add(stripped_args, "-MF");
+ args_add(stripped_args, default_depfile_name);
+ }
+
+ if (!dependency_target_specified) {
+ args_add(stripped_args, "-MT");
+ args_add(stripped_args, output_file);
+ }
+ }
+
/* cope with -o /dev/null */
if (strcmp(output_file,"/dev/null") != 0 && stat(output_file, &st) == 0 && !S_ISREG(st.st_mode)) {
cc_log("Not a regular file %s\n", output_file);
Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ccache.spec 24 Jul 2009 18:41:35 -0000 1.24
+++ ccache.spec 10 Aug 2009 17:43:51 -0000 1.25
@@ -6,7 +6,7 @@
Name: ccache
Version: 2.4
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: C/C++ compiler cache
Group: Development/Tools
@@ -19,7 +19,7 @@ Patch0: %{name}-html-links.patch
Patch1: %{name}-2.4-coverage-231462.patch
Patch2: %{name}-2.4-hardlink-doc.patch
Patch3: %{name}-2.4-noHOME-315441.patch
-Patch4: http://darkircop.org/ccache/ccache-2.4-md.patch
+Patch4: http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/06_md.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(File::Spec)
@@ -102,86 +102,89 @@ done
%changelog
+* Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-16
+- Switch #438201 patch URL to Debian patch tracking (original is MIA).
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-13
+* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-13
- Apply patch to fix path to saved dependency files (#438201).
-* Sat Feb 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-12
+* Sat Feb 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-12
- Rebuild.
-* Tue Oct 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
+* Tue Oct 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
- Apply upstream fix for problems when $HOME is not set (#315441).
-* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
- Fix URL to upstream tarball.
-* Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
+* Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
- License: GPLv2+
- Make compiler symlinks relative.
- Make profile.d scripts noreplace.
-* Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
+* Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
- Use shared cache dir for users in the ccache group by default
(#247760, based on Andy Shevchenko's work).
- Fix outdated hardlink info in cache sharing docs.
- Add auto-symlink support for avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++).
- Make triggers always exit with a zero exit status.
-* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
+* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
- Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
(upstream CVS and Matt Fago, #231462).
-* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
+* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
- Require coreutils for triggers (#215030).
-* Wed Aug 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
+* Wed Aug 9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
- Add auto-symlink support for compat-gcc-34(-c++).
- Untabify, escape macros in changelog.
-* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
+* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
- Add auto-symlink support for g++-libstdc++-so_7.
-* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
- Drop "bin" from compiler symlink path.
- Make profile.d snippets non-executable (#35714).
-* Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
+* Sun May 1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
- Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
bunch of no longer relevant compilers.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
- rebuilt
-* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
+* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
- Update to 2.4.
- Add symlinking support for gcc4 and gcc4-c++.
- Move the ccache executable to %%{_bindir}.
- Include more docs.
-* Fri Jun 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
+* Fri Jun 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
- Add support for gcc33 and g++33.
-* Thu Jun 10 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
+* Thu Jun 10 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
- Fix hardcoded lib path in profile.d scriptlets (bug 1558).
-* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
+* Mon May 3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
- Add support for gcc34 and g++34, and
%%{_target_cpu}-%%{_vendor}-%%{_target_os}-* variants.
-* Thu Nov 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
+* Thu Nov 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
- Add overriding symlinks for gcc-ssa and g++-ssa (bug 963).
-* Tue Nov 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
+* Tue Nov 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
- Update to 2.3.
- Implement triggers to keep list of "aliased" compilers up to date on the fly.
- Add gcc32 and a bunch of legacy packages to the list of overridden compilers.
-* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
+* Sat Aug 2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
- Add c++ to the list of overridden compilers (bug 548).
- Own everything including dirs under %%{_libdir}/ccache (bug 529).
- %%{buildroot} -> $RPM_BUILD_ROOT.
--- ccache-2.4-md.patch DELETED ---
- Previous message (by thread): rpms/python-tw-jquery/EL-5 python-tw-jquery.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/pytrainer/devel .cvsignore, 1.5, 1.6 pytrainer.spec, 1.14, 1.15 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list