From 936be892ddc956164c9d9e2bf5cd86165cc5d4d5 Mon Sep 17 00:00:00 2001 From: Matt Johnson Date: Sat, 27 Nov 2010 21:52:14 +0100 Subject: [PATCH] xserver-xorg: fix CFLAGS Ensure we just append to TARGET_CFLAGS, instead of overriding it. Signed-off-by: Matt Johnson Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 0228213b23..cb1daff5d5 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 31b23f092c..2cf5fb36cd 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) -- 2.30.2