blob: aafb352355d12f35ff8d275f6fc7c9d6f0d28eef (
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
43
44
45
46
47
48
49
50
51
|
From 9324466141626518e5a67838813562ec6ef62ba3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 15 Nov 2012 18:31:53 +0100
Subject: [PATCH] util: don't link makestrs with target cflags
The line:
makestrs_CFLAGS = $(XT_CFLAGS)
in util/Makefile.am is wrong because it adds target cflags to the
compilation of makestrs, which is built for the build machine, which
leads to build failures when cross-compiling.
We also remove the inclusion of <X11/Xos.h> from makestrs.c, because
it was the only non-standard header being included (and therefore
possibly requiring special cflags), but it was in reality not useful
at all to build makestrs.c.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
util/Makefile.am | 1 -
util/makestrs.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/util/Makefile.am b/util/Makefile.am
index 969ecef..cc6f3fc 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -10,7 +10,6 @@ EXTRA_DIST = \
StrDefs.ht \
string.list
-makestrs_CFLAGS = $(XT_CFLAGS)
makestrs_SOURCES = makestrs.c
diff --git a/util/makestrs.c b/util/makestrs.c
index 3551cc1..456735b 100644
--- a/util/makestrs.c
+++ b/util/makestrs.c
@@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group.
/* Constructs string definitions */
#include <stdio.h>
-#include <X11/Xos.h>
#include <stdlib.h>
#include <unistd.h>
#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
--
1.7.9.5
|
