| Message ID | 12049623b5fe0017d72462d6264e018a6e1c8534.camel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [committed,PR,other/55930] Honor --disable-dependency-tracking in libatomic | expand |
On Sat, Feb 22, 2020 at 08:18:38AM -0700, Jeff Law wrote: > Applied to the trunk, > --- a/libatomic/Makefile.am > +++ b/libatomic/Makefile.am > @@ -101,7 +101,9 @@ PAT_S = $(word 3,$(PAT_SPLIT)) > IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) > IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) > > -M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo > +@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo > +@AMDEP_TRUE@M_DEPS = This looks wrong and automake rightfully complains about it (though the #c2 patch looked ok). Fixed thusly, committed to trunk as obvious. diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index d38961409cd..93031221e54 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,10 @@ +2020-02-22 Jakub Jelinek <jakub@redhat.com> + + PR other/55930 + * Makefile.am (M_DEPS): Guard the empty definition with + @AMDEP_FALSE@ rather than @AMDEP_TRUE@. + * Makefile.in: Regenerated. + 2020-02-22 Richard Purdie <rpurdie@rpsys.net> PR other/55930 diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am index 46a060a6267..133fbbca77e 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -102,7 +102,7 @@ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) @AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -@AMDEP_TRUE@M_DEPS = +@AMDEP_FALSE@M_DEPS = M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index 935762e9dbd..a51807e95c9 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -416,7 +416,7 @@ PAT_S = $(word 3,$(PAT_SPLIT)) IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) @AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -@AMDEP_FALSE@M_DEPS = +@AMDEP_FALSE@M_DEPS = M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c Jakub
diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 4aeaadb189c..d38961409cd 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,9 @@ +2020-02-22 Richard Purdie <rpurdie@rpsys.net> + + PR other/55930 + * Makefile.am (M_DEPS): Honor -disable-dependency-tracking. + * Makefile.in: Regenerated. + 2020-01-24 Maciej W. Rozycki <macro@wdc.com> * configure.ac: Handle `--with-toolexeclibdir='. diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am index 61e449a3404..46a060a6267 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -101,7 +101,9 @@ PAT_S = $(word 3,$(PAT_SPLIT)) IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) -M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo +@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo +@AMDEP_TRUE@M_DEPS = + M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index acf8839a919..935762e9dbd 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -415,7 +415,8 @@ PAT_N = $(word 2,$(PAT_SPLIT)) PAT_S = $(word 3,$(PAT_SPLIT)) IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) -M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo +@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo +@AMDEP_FALSE@M_DEPS = M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c
As outlined in the PR, libatomic was not honoring --disable-dependency- tracking. The trivial patch from Richard Purdie attached to the BZ fixes the problem. Applied to the trunk, Jeff commit d6f420d98126ac51396b89fbe287a32287cd92ed Author: Richarde Purdie <rpurdie@rpsys.net> Date: Sat Feb 22 10:13:13 2020 -0500 Honor --disable-dependency-tracking in libatomic PR other/55930 * Makefile.am (M_DEPS): Honor -disable-dependency-tracking. * Makefile.in: Regenerated.