summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnson <mj1856@hotmail.com>2010-11-27 20:52:14 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-11-27 21:23:49 (GMT)
commit936be892ddc956164c9d9e2bf5cd86165cc5d4d5 (patch)
treed62ae011e0232ff076b163fdce8abc19984db4b8
parent69b2cc76b3587a3ed551e7d2e025fd3ea4f33992 (diff)
downloadbuildroot-936be892ddc956164c9d9e2bf5cd86165cc5d4d5.tar.gz
buildroot-936be892ddc956164c9d9e2bf5cd86165cc5d4d5.tar.bz2
xserver-xorg: fix CFLAGS
Ensure we just append to TARGET_CFLAGS, instead of overriding it. Signed-off-by: Matt Johnson <mj1856@hotmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 0228213..cb1daff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
Fixes all over the tree.
- Updated/fixed packages: qt
+ Updated/fixed packages: qt, xserver-xorg
2010.11-rc2, Released November 25th, 2010:
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 31b23f0..2cf5fb3 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -60,7 +60,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
--disable-xnest --disable-xephyr --disable-xvfb \
--with-builder-addr=buildroot@uclibc.org \
- CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1" \
+ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \
--with-fontdir=/usr/share/fonts/X11/
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)