summaryrefslogtreecommitdiffstats
path: root/patches/02_PR55930-dependency-tracking.patch
blob: addf21bf112d76091a3b38d76f0ada42ef617421 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
From: Richard Purdie
Origin: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930
Subject: libatomic build failure if configured with --disable-dependency-tracking

opkhelper passes --disable-dependency-tracking to configure.  GCC 4.8.0 and
later fail to build with the following error:

    libtool: compile:  /prokit/sessions/2175435107/wd/tmp/obj-amd64-linux-glibc/./gcc/xgcc -B/prokit/sessions/2175435107/wd/tmp/obj-amd64-linux-glibc/./gcc/ -B/usr/x86_64-unknown-linux-gnu/bin/ -B/usr/x86_64-unknown-linux-gnu/lib/ -isystem /usr/x86_64-unknown-linux-gnu/include -isystem /usr/x86_64-unknown-linux-gnu/sys-include -DHAVE_CONFIG_H -I/prokit/sessions/2175435107/wd/tmp/src/libatomic/config/x86 -I/prokit/sessions/2175435107/wd/tmp/src/libatomic/config/posix -I/prokit/sessions/2175435107/wd/tmp/src/libatomic -I. -Wall -Werror -pthread -g -O2 -MT load_1_.lo -MD -MP -MF .deps/load_1_.lo.Ppo -DN=1 -c /prokit/sessions/2175435107/wd/tmp/src/libatomic/load_n.c  -fPIC -DPIC -o .libs/load_1_.o
    /prokit/sessions/2175435107/wd/tmp/src/libatomic/load_n.c:115:1: fatal error: opening dependency file .deps/load_1_.lo.Ppo: No such file or directory
     EXPORT_ALIAS (SIZE(load));
     ^~~~~~~~~~~~
    compilation terminated.
    Makefile:801: recipe for target 'load_1_.lo' failed
    make[6]: *** [load_1_.lo] Error 1
    make[6]: Leaving directory '/prokit/sessions/2175435107/wd/tmp/obj-amd64-linux-glibc/x86_64-unknown-linux-gnu/libatomic'

diff -Naurp src.orig/libatomic/Makefile.am src/libatomic/Makefile.am
--- src.orig/libatomic/Makefile.am	2018-01-03 05:03:58.000000000 -0500
+++ src/libatomic/Makefile.am	2019-05-03 02:07:09.451400152 -0400
@@ -101,7 +101,8 @@ 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
diff -Naurp src.orig/libatomic/Makefile.in src/libatomic/Makefile.in
--- src.orig/libatomic/Makefile.in	2019-02-22 09:22:13.000000000 -0500
+++ src/libatomic/Makefile.in	2019-05-03 02:07:33.483372176 -0400
@@ -335,7 +335,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