diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-01-11 07:34:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:37:03 +0000 |
commit | 52691e7284a4a4c23cb6ecf981231d259c9b0b0d (patch) | |
tree | ec34c403863f9488d11dbaccdd9aab0644073c01 /meta/recipes-graphics/xtscal | |
parent | 5a91224e9c6936ed76c3c27842b438b437e10bff (diff) | |
download | openembedded-core-52691e7284a4a4c23cb6ecf981231d259c9b0b0d.tar.gz openembedded-core-52691e7284a4a4c23cb6ecf981231d259c9b0b0d.tar.bz2 openembedded-core-52691e7284a4a4c23cb6ecf981231d259c9b0b0d.tar.xz openembedded-core-52691e7284a4a4c23cb6ecf981231d259c9b0b0d.zip |
xtscal: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso
linking change patch. This was causing build errors for this
recipe. Specifying the libXrender library explicitely for linking to
work without errors.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-graphics/xtscal')
-rw-r--r-- | meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch | 25 | ||||
-rw-r--r-- | meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 3 |
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 000000000..3ca14d7f4 --- /dev/null +++ b/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch @@ -0,0 +1,25 @@ +after gcc linking has changed, all the libraries must be explicitely specified +This patch avoids this linking error: + +| 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 +| /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 +| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M +| collect2: ld returned 1 exit status^M +| make: *** [xtscal] Error 1 + +Nitin A Kamble <nitin.a.kamble@intel.com> +Date: 2011/01/11 + +Index: xtscal-0.6.3/configure.ac +=================================================================== +--- xtscal-0.6.3.orig/configure.ac ++++ xtscal-0.6.3/configure.ac +@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) + # Checks for programs. + AC_PROG_CC + +-PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) ++PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) + + AC_CONFIG_FILES([Makefile]) + 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 2136f340e..539399ed6 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" DEPENDS = "virtual/libx11 libxft libxcalibrate" -PR = "r12" +PR = "r13" SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ file://change-cross.patch;patch=1 \ file://cleanup.patch;patch=1 \ + file://dso_linking_change_build_fix.patch \ file://30xTs_Calibrate.sh" SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" |