aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-09-27 20:33:14 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:09:04 +0100
commit83c560ae282c1a28fd2c311c66debd02a69f1678 (patch)
treec5382f0fb5548e077bb2a3a0e3c0150f5ec70ee0
parentf162f0ecc96fdfb564aad968e5b8bc670640ea68 (diff)
downloadopenembedded-core-contrib-83c560ae282c1a28fd2c311c66debd02a69f1678.tar.gz
openembedded-core-contrib-83c560ae282c1a28fd2c311c66debd02a69f1678.tar.bz2
openembedded-core-contrib-83c560ae282c1a28fd2c311c66debd02a69f1678.zip
libx11.inc: fix build issues for older CentOS distros
Fixes these sorts of issues present on older gcc (CentOS 5.x in this case) | cc1: error: unrecognized command line option "-Werror=implicit" | cc1: error: unrecognized command line option "-Werror=nonnull" | cc1: error: unrecognized command line option "-Werror=init-self" | cc1: error: unrecognized command line option "-Werror=main" | cc1: error: unrecognized command line option "-Werror=missing-braces" | cc1: error: unrecognized command line option "-Werror=sequence-point" | cc1: error: unrecognized command line option "-Werror=return-type" | cc1: error: unrecognized command line option "-Werror=trigraphs" | cc1: error: unrecognized command line option "-Werror=array-bounds" | cc1: error: unrecognized command line option "-Werror=write-strings" | cc1: error: unrecognized command line option "-Werror=address" | cc1: error: unrecognized command line option "-Werror=int-to-pointer-cast" | cc1: error: unrecognized command line option "-Werror=pointer-to-int-cast" Also fixes: makekeys-makekeys.o: In function `main': makekeys.c:(.text+0x85): undefined reference to `__isoc99_sscanf' makekeys.c:(.text+0xa7): undefined reference to `__isoc99_sscanf' collect2: ld returned 1 exit status make: *** [makekeys] Error 1 Older libc do not have this defined, we can use the -D_GNU_SOURCE to the compiler to prevent generating calls to this function and make linking work Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 3ecd9e50b3..97bd1c20fa 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,7 +11,7 @@ inherit siteinfo
FILESPATH = "${FILE_DIRNAME}/libx11"
PE = "1"
-INC_PR = "r8"
+INC_PR = "r9"
PROVIDES = "virtual/libx11"
@@ -23,6 +23,7 @@ DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto"
DEPENDS += "xproto-native"
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"
+EXTRA_OEMAKE += 'CWARNFLAGS=""'
# Let people with incredibly archaic requirements enable Xcms and BigFont, but
# disable them by default.
@@ -33,7 +34,7 @@ PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfont
# src/util/makekeys needs to be compiled natively, so tell it what compiler to
# use.
export CC_FOR_BUILD = "${BUILD_CC}"
-export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -D_GNU_SOURCE"
export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"