• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/libatasmart/0001-strpool-cross-flags.patch
Peter KorsgaardPeter Korsgaard committed 298cd8eaa2103 Feb 2015
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 730158700ea7a554c37f24bfbf5f4985f7280f3e Mon Sep 17 00:00:00 2001
2
From: Peter Korsgaard <jacmet@sunsite.dk>
3
Date: Wed, 6 Feb 2013 14:07:02 +0100
4
Subject: [PATCH] strpool: don't mix up host/build flags when cross compiling
5
​
6
Submitted upstream as https://bugs.freedesktop.org/show_bug.cgi?id=60364
7
​
8
Commit b71035ce89 (build-sys: modernize build system) changed the strpool
9
(which needs to be built for the build machine) compilation to use
10
AM_CFLAGS / AM_LDFLAGS rather than CFLAGS / LDFLAGS. This is wrong, as
11
The AM_ version is used TOGETHER with (the user supplied) CFLAGS/LDFLAGS,
12
causing strpool to use both CFLAGS (for host) and CCFLAGS_FOR_BUILD (for
13
build) flags, breaking cross compilation with errors like:
14
​
15
cc1: error: unrecognized command line option "-mabi=spe"
16
​
17
Instead overwrite the (user supplied) CFLAGS with the (user supplied)
18
CFLAGS_FOR_BUILD (and similar for LDFLAGS) like we used to do.
19
​
20
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
21
---
22
 strpool/Makefile.am |    4 ++--
23
 1 file changed, 2 insertions(+), 2 deletions(-)
24
​
25
diff --git a/strpool/Makefile.am b/strpool/Makefile.am
26
index b041cea..5b335a5 100644
27
--- a/strpool/Makefile.am
28
+++ b/strpool/Makefile.am
29
@@ -17,8 +17,8 @@
30
 # <http://www.gnu.org/licenses/>.
31
 
32
 CC = @CC_FOR_BUILD@
33
-AM_CFLAGS = @BUILD_CFLAGS@
34
-AM_LDFLAGS = @BUILD_LDFLAGS@
35
+CFLAGS = @BUILD_CFLAGS@
36
+LDFLAGS = @BUILD_LDFLAGS@
37
 
38
 noinst_PROGRAMS = \
39
    strpool
40
-- 
41
1.7.10.4
42
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.