diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2013-05-19 23:37:00 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-05-23 23:23:54 +0200 |
| commit | 1287492fd7d4b4fc61678e684c2adddde93a1bbc (patch) | |
| tree | f0cc3ed89705fd8c4d2ce7e367fc0a0fa53fe070 /package/pixman | |
| parent | 686d4f433b4acb7846cd8d881a03803b911d418c (diff) | |
| download | buildroot-novena-1287492fd7d4b4fc61678e684c2adddde93a1bbc.tar.gz buildroot-novena-1287492fd7d4b4fc61678e684c2adddde93a1bbc.zip | |
pixman: Apply upstream patch to fix compilation on MIPS
Fixes:
http://autobuild.buildroot.net/results/38aa4f2a2269b80226b910c46e0c9abe7dc38ff8/
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/pixman')
| -rw-r--r-- | package/pixman/pixman-loongson-cflags.patch | 38 | ||||
| -rw-r--r-- | package/pixman/pixman.mk | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/package/pixman/pixman-loongson-cflags.patch b/package/pixman/pixman-loongson-cflags.patch new file mode 100644 index 000000000..fc53be234 --- /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 326f9ebb2..8b35ef190 100644 --- a/package/pixman/pixman.mk +++ b/package/pixman/pixman.mk @@ -7,6 +7,8 @@ PIXMAN_VERSION = 0.30.0 PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib PIXMAN_INSTALL_STAGING = YES PIXMAN_DEPENDENCIES = host-pkgconf +PIXMAN_AUTORECONF = YES + # don't build gtk based demos PIXMAN_CONF_OPT = --disable-gtk |