File: 0010-base-now-part-of-lib_binaries-again-not-arch_binarie.patch

package info (click to toggle)
cross-gcc 249
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 892 kB
  • sloc: sh: 564; makefile: 196
file content (33 lines) | stat: -rw-r--r-- 1,234 bytes parent folder | download
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
From 373eaa0cde2c550dc80236ec21b5c4c4e6168056 Mon Sep 17 00:00:00 2001
From: Dima Kogan <dima@secretsauce.net>
Date: Tue, 9 Jun 2015 02:13:04 -0700
Subject: [PATCH 10/10] 'base' now part of lib_binaries again, not
 arch_binaries

This was changed in Debian gcc 5.1.1-8. After that change, 'base' went
into arch_binaries, which made the 'base' build a dependency of
'binary-arch' in rules2, and building the cross toolchain would thus
invoke the rules for $(binary_stamp)-base in binary-base.mk. Those
rules have a problem: lots of instances of error 'package gcc-5-base
is not in control info'.

This patch reverts to the old behavior where we don't invoke the
$(binary_stamp)-base rules at all. It's not generically correct, and
we should either fix these rules, or skip them in a more explicit way
---
 debian/rules.d/binary-base.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules.d/binary-base.mk b/debian/rules.d/binary-base.mk
index b7c9aec..ecac33c 100644
--- a/debian/rules.d/binary-base.mk
+++ b/debian/rules.d/binary-base.mk
@@ -1,4 +1,4 @@
-arch_binaries += base
+$(lib_binaries) += base
 ifeq ($(with_gcclbase),yes)
   ifneq ($(with_base_only),yes)
     indep_binaries += lbase
-- 
2.42.0