summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch25
-rw-r--r--meta/recipes-graphics/xtscal/xtscal_0.6.3.bb3
2 files changed, 27 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000000..3ca14d7f4d
--- /dev/null
+++ b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch
@@ -0,0 +1,25 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids this linking error:
3
4| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M
5| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M
6| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M
7| collect2: ld returned 1 exit status^M
8| make: *** [xtscal] Error 1
9
10Nitin A Kamble <nitin.a.kamble@intel.com>
11Date: 2011/01/11
12
13Index: xtscal-0.6.3/configure.ac
14===================================================================
15--- xtscal-0.6.3.orig/configure.ac
16+++ xtscal-0.6.3/configure.ac
17@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
18 # Checks for programs.
19 AC_PROG_CC
20
21-PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate)
22+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender)
23
24 AC_CONFIG_FILES([Makefile])
25 AC_OUTPUT
diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
index 2136f340e6..539399ed63 100644
--- a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
+++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb
@@ -9,11 +9,12 @@ SECTION = "x11/base"
9 9
10DEPENDS = "virtual/libx11 libxft libxcalibrate" 10DEPENDS = "virtual/libx11 libxft libxcalibrate"
11 11
12PR = "r12" 12PR = "r13"
13 13
14SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ 14SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \
15 file://change-cross.patch;patch=1 \ 15 file://change-cross.patch;patch=1 \
16 file://cleanup.patch;patch=1 \ 16 file://cleanup.patch;patch=1 \
17 file://dso_linking_change_build_fix.patch \
17 file://30xTs_Calibrate.sh" 18 file://30xTs_Calibrate.sh"
18 19
19SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" 20SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34"