projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69b2cc7)
xserver-xorg: fix CFLAGS
authorMatt Johnson <mj1856@hotmail.com>
Sat, 27 Nov 2010 20:52:14 +0000 (21:52 +0100)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sat, 27 Nov 2010 21:23:49 +0000 (22:23 +0100)
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>
CHANGES patch | blob | history
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk patch | blob | history

diff --git a/CHANGES b/CHANGES
index 0228213b2356ae52e1cd429de654986c17c7d1a3..cb1daff5d5bd7379a1f1e77b90c754344018b54e 100644 (file)
--- 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 31b23f092c7a2223d24485a9f2ba47a94f142f36..2cf5fb36cd83c254dead08feaa935fa9309407e0 100644 (file)
--- 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)