diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-02 16:33:05 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-02 16:33:05 +0200 |
commit | 1ba51d2fbddd5650f8caea0a327b9031238ad843 (patch) | |
tree | 05d5df7b487e76597b34cb0b1fc9543525169a62 /package/pixman | |
parent | 0c94aa549cc8cf483bc8c3443a2b1f772d5d180b (diff) | |
parent | fb2f3d58bde6aaac12b62eeb16492c93329b8713 (diff) | |
download | buildroot-1ba51d2fbddd5650f8caea0a327b9031238ad843.tar.gz buildroot-1ba51d2fbddd5650f8caea0a327b9031238ad843.zip |
Merge branch 'next'
Diffstat (limited to 'package/pixman')
-rw-r--r-- | package/pixman/pixman-loongson-cflags.patch | 38 | ||||
-rw-r--r-- | package/pixman/pixman.mk | 4 |
2 files changed, 41 insertions, 1 deletions
diff --git a/package/pixman/pixman-loongson-cflags.patch b/package/pixman/pixman-loongson-cflags.patch new file mode 100644 index 0000000000..fc53be234e --- /dev/null +++ b/package/pixman/pixman-loongson-cflags.patch @@ -0,0 +1,38 @@ +configure.ac: Verify that the Loongson MMI code can link + +The Loongson MMI code modifies -march and as a result it breaks linking +when the rest of the code is built with a different -match/-mtune. +This patch fixes the problem by trying to link the code instead of just +compiling it. This patch is already committed upstream. + +Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> + +From d77d75cc6e5de14d027d22b70389a4d0c71048b9 Mon Sep 17 00:00:00 2001 +From: Markos Chandras <markos.chandras@imgtec.com> +Date: Wed, 15 May 2013 16:51:20 +0000 +Subject: Use AC_LINK_IFELSE to check if the Loongson MMI code can link + +The Loongson code is compiled with -march=loongson2f to enable the MMI +instructions, but binutils refuses to link object code compiled with +different -march settings, leading to link failures later in the +compile. This avoids that problem by checking if we can link code +compiled for Loongson. + +Reviewed-by: Matt Turner <mattst88@gmail.com> +Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> +--- +diff --git a/configure.ac b/configure.ac +index c43a0d2..221179f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -279,7 +279,7 @@ AC_MSG_CHECKING(whether to use Loongson MMI assembler) + + xserver_save_CFLAGS=$CFLAGS + CFLAGS=" $LS_CFLAGS $CFLAGS -I$srcdir" +-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++AC_LINK_IFELSE([AC_LANG_SOURCE([[ + #ifndef __mips_loongson_vector_rev + #error "Loongson Multimedia Instructions are only available on Loongson" + #endif +-- +cgit v0.9.0.2-2-gbebe diff --git a/package/pixman/pixman.mk b/package/pixman/pixman.mk index c2ee035ff6..a59568173e 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -3,13 +3,15 @@ # pixman # ################################################################################ -PIXMAN_VERSION = 0.28.2 +PIXMAN_VERSION = 0.30.0 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_LICENSE = MIT PIXMAN_LICENSE_FILES = COPYING PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf +PIXMAN_AUTORECONF = YES + # don't build gtk based demos PIXMAN_CONF_OPT = --disable-gtk |