This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] build: random timestamps have multilib conflicts (PR other/43480)
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 22 Mar 2010 17:27:14 +0100
- Subject: [patch] build: random timestamps have multilib conflicts (PR other/43480)
Hi,
the problem I am trying to solve is:
Transaction Check Error:
file /usr/share/man/man1/gcj-dbtool.1.gz conflicts between attempted installs
of libgcj-4.4.3-8.fc13.x86_64 and libgcj-4.4.3-8.fc13.i686
file /usr/share/man/man1/gij.1.gz conflicts between attempted installs of
libgcj-4.4.3-8.fc13.x86_64 and libgcj-4.4.3-8.fc13.i686
file /usr/share/man/man1/grmic.1.gz conflicts between attempted installs of
libgcj-4.4.3-8.fc13.x86_64 and libgcj-4.4.3-8.fc13.i686
file /usr/share/man/man1/jv-convert.1.gz conflicts between attempted installs
of libgcj-4.4.3-8.fc13.x86_64 and libgcj-4.4.3-8.fc13.i686
It is due to:
$ gzip -dc ./libgcj-4.4.3-8.fc13.i686/usr/share/man/man1/gij.1.gz >gij-i686
$ gzip -dc ./libgcj-4.4.3-8.fc13.x86_64/usr/share/man/man1/gij.1.gz >gij-x86_64
$ diff -u gij-*
#--- gij-i686 2010-03-22 10:17:59.000000000 +0100
#+++ gij-x86_64 2010-03-22 10:18:07.000000000 +0100
#@@ -124,7 +124,7 @@
# .\" ========================================================================
# .\"
# .IX Title "GIJ 1"
#-.TH GIJ 1 "2010-02-27" "gcc-4.4.3" "GNU"
#+.TH GIJ 1 "2010-02-26" "gcc-4.4.3" "GNU"
# .\" For nroff, turn off justification. Always turn off hyphenation; it makes
# .\" way too many mistakes in technical documents.
# .if n .ad l
One host built that file a different time (day) then a different host.
Moreover the files content should not depend on their time of build.
Patch applies to both GCC HEAD SVN and fastjar CVS.
GCC successfullt rebuilt with this patch:
https://koji.fedoraproject.org/scratch/jkratoch/task_2067448/
now having there:
.TH GIJ 1 "2009-01-14" "gcc-4.4.3" "GNU"
OK to check-in? (I would have to ask for fastjar technical access.)
Thanks,
Jan
fastjar/
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* Makefile.am (fastjar.pod, grepjar.pod): Preserve modification time.
* Makefile.in: Regenerate.
gcc/java/
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* Make-lang.in (gcj.pod, jcf-dump.pod, gij.pod, jv-convert.pod)
(grmic.pod, gcj-dbtool.pod, gc-analyze.pod, aot-compile.pod)
(rebuild-gcj-db.pod): Preserve modification time.
gcc/fortran/
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* Make-lang.in (gfortran.pod): Preserve modification time.
gcc/
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* Makefile.in (%.pod, gcc.pod, gfdl.pod, fsf-funding.pod, gpl.pod):
Preserve modification time.
libjava/classpath/
2010-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* doc/Makefile.am (gappletviewer.pod, gjarsigner.pod, gjar.pod)
(gcjh.pod, gjavah.pod, gkeytool.pod, gnative2ascii.pod, gorbd.pod)
(grmid.pod, grmiregistry.pod, gserialver.pod, gtnameserv.pod)
(gjdoc.pod): Preserve modification time.
* doc/Makefile.in: Regenerate.
--- Makefile.am 16 Oct 2008 08:25:58 -0000 1.22
+++ Makefile.am 22 Mar 2010 15:38:58 -0000
@@ -50,9 +50,11 @@ POD2MAN = pod2man --center="GNU" --relea
fastjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D fastjar $< > $@
+ -touch -r $< $@
grepjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D grepjar $< > $@
+ -touch -r $< $@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
--- Makefile.in 7 Sep 2009 00:22:38 -0000 1.34
+++ Makefile.in 22 Mar 2010 15:38:59 -0000
@@ -1435,9 +1435,11 @@ uninstall-man: uninstall-man1
fastjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D fastjar $< > $@
+ -touch -r $< $@
grepjar.pod: $(srcdir)/fastjar.texi
-$(TEXI2POD) -D grepjar $< > $@
+ -touch -r $< $@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
--- gcc/java/Make-lang.in (revision 157619)
+++ gcc/java/Make-lang.in (working copy)
@@ -365,22 +365,31 @@ $(build_htmldir)/java/index.html: $(TEXI
gcj.pod: java/gcj.texi
-$(TEXI2POD) -D gcj < $< > $@
+ -touch -r $< $@
jcf-dump.pod: java/gcj.texi
-$(TEXI2POD) -D jcf-dump < $< > $@
+ -touch -r $< $@
gij.pod: java/gcj.texi
-$(TEXI2POD) -D gij < $< > $@
+ -touch -r $< $@
jv-convert.pod: java/gcj.texi
-$(TEXI2POD) -D jv-convert < $< > $@
+ -touch -r $< $@
grmic.pod: java/gcj.texi
-$(TEXI2POD) -D grmic < $< > $@
+ -touch -r $< $@
gcj-dbtool.pod: java/gcj.texi
-$(TEXI2POD) -D gcj-dbtool < $< > $@
+ -touch -r $< $@
gc-analyze.pod: java/gcj.texi
-$(TEXI2POD) -D gc-analyze < $< > $@
+ -touch -r $< $@
aot-compile.pod: java/gcj.texi
-$(TEXI2POD) -D aot-compile < $< > $@
+ -touch -r $< $@
rebuild-gcj-db.pod: java/gcj.texi
-$(TEXI2POD) -D rebuild-gcj-db < $< > $@
+ -touch -r $< $@
# Install the man pages.
java.install-man: installdirs \
--- gcc/fortran/Make-lang.in (revision 157619)
+++ gcc/fortran/Make-lang.in (working copy)
@@ -208,6 +208,7 @@ $(build_htmldir)/gfortran/index.html: $(
gfortran.pod: $(GFORTRAN_TEXI)
-$(TEXI2POD) -DBUGURL="$(BUGURL_TEXI)" \
< $(srcdir)/fortran/invoke.texi > $@
+ -touch -r $< $@
# GFORTRAN internals documentation.
GFC_INTERNALS_TEXI = \
--- gcc/Makefile.in (revision 157619)
+++ gcc/Makefile.in (working copy)
@@ -4123,6 +4123,7 @@ doc/%.7: %.pod
%.pod: %.texi
$(STAMP) $@
-$(TEXI2POD) -DBUGURL="$(BUGURL_TEXI)" $< > $@
+ -touch -r $< $@
.INTERMEDIATE: cpp.pod gcc.pod gfdl.pod fsf-funding.pod
cpp.pod: cpp.texi cppenv.texi cppopts.texi
@@ -4133,15 +4134,19 @@ cpp.pod: cpp.texi cppenv.texi cppopts.te
gcc.pod: invoke.texi cppenv.texi cppopts.texi gcc-vers.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
+ -touch -r $< $@
gfdl.pod: fdl.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
+ -touch -r $< $@
fsf-funding.pod: funding.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
+ -touch -r $< $@
gpl.pod: gpl_v3.texi
$(STAMP) $@
-$(TEXI2POD) $< > $@
+ -touch -r $< $@
#
# Deletion of files made during compilation.
--- libjava/classpath/doc/Makefile.in (revision 157619)
+++ libjava/classpath/doc/Makefile.in (working copy)
@@ -1053,18 +1053,23 @@ docs: cp-hacking.ps cp-vmintegration.ps
gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@
+ -touch -r $< $@
gjarsigner.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjarsigner < $< > $@
+ -touch -r $< $@
gjar.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjar < $< > $@
+ -touch -r $< $@
gcjh.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gcjh < $< > $@
+ -touch -r $< $@
gjavah.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjavah < $< > $@
+ -touch -r $< $@
# hack around the cross references and the enumeration
gkeytool.pod: $(srcdir)/cp-tools.texinfo
@@ -1072,27 +1077,35 @@ gkeytool.pod: $(srcdir)/cp-tools.texinfo
| sed -e 's/^For more details.*/See I<Common Options> for more details./' \
-e 's/1\.<\([^>]*\)>/- \1/' \
> $@
+ -touch -r $< $@
gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gnative2ascii < $< > $@
+ -touch -r $< $@
gorbd.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gorbd < $< > $@
+ -touch -r $< $@
grmid.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmid < $< > $@
+ -touch -r $< $@
grmiregistry.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmiregistry < $< > $@
+ -touch -r $< $@
gserialver.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gserialver < $< > $@
+ -touch -r $< $@
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@
+ -touch -r $< $@
gjdoc.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjdoc < $< > $@
+ -touch -r $< $@
all-local: $(STAMP_GENINSRC)
--- libjava/classpath/doc/Makefile.am (revision 157619)
+++ libjava/classpath/doc/Makefile.am (working copy)
@@ -47,18 +47,23 @@ STAMP = echo timestamp >
gappletviewer.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gappletviewer < $< > $@
+ -touch -r $< $@
gjarsigner.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjarsigner < $< > $@
+ -touch -r $< $@
gjar.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjar < $< > $@
+ -touch -r $< $@
gcjh.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gcjh < $< > $@
+ -touch -r $< $@
gjavah.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjavah < $< > $@
+ -touch -r $< $@
# hack around the cross references and the enumeration
gkeytool.pod: $(srcdir)/cp-tools.texinfo
@@ -66,27 +71,35 @@ gkeytool.pod: $(srcdir)/cp-tools.texinfo
| sed -e 's/^For more details.*/See I<Common Options> for more details./' \
-e 's/1\.<\([^>]*\)>/- \1/' \
> $@
+ -touch -r $< $@
gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gnative2ascii < $< > $@
+ -touch -r $< $@
gorbd.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gorbd < $< > $@
+ -touch -r $< $@
grmid.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmid < $< > $@
+ -touch -r $< $@
grmiregistry.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D grmiregistry < $< > $@
+ -touch -r $< $@
gserialver.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gserialver < $< > $@
+ -touch -r $< $@
gtnameserv.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gtnameserv < $< > $@
+ -touch -r $< $@
gjdoc.pod: $(srcdir)/cp-tools.texinfo
-$(TEXI2POD) -D gjdoc < $< > $@
+ -touch -r $< $@
# GCJ LOCAL CHANGE
#CLEANFILES = $(TOOLS_MANFILES)