Commit 5c8705cc authored by Łukasz Nowak's avatar Łukasz Nowak

Revert "use our own gcc to buid libtiff and tesseract (thanks Kazuhiko)"

This issue was found on system which had libstdc++ dynamic library not functional.
It is pointing to broken link which results in error:

/usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/4.4.5/libstdc++.a(ios_init.o): relocation R_X86_64_32 against `pthread_cancel' can not be used when making a shared object; recompile with -fPIC

Each time dynamic library tries to use stdc++, as libstdc++.so was broken link.

Currently SlapOS requires "sane" host: which has working libc, libc++ and gcc.

Some day in future SlapOS node software can provide own compiler, toolchain
and libc with libc++.

This reverts commit 6819f5a8.
parent 7f4141a5
......@@ -3,7 +3,6 @@ extends =
../libjpeg/buildout.cfg
../jbigkit/buildout.cfg
../zlib/buildout.cfg
../gcc/buildout.cfg
parts =
libtiff
......@@ -18,7 +17,5 @@ configure-options =
--disable-static
--without-x
environment =
PATH=${gcc-java:location}/bin:%(PATH)s
LD_LIBRARY_PATH=${gcc-java:location}/lib:${gcc-java:location}/lib64
CPPFLAGS=-I${libjpeg:location}/include -I${jbigkit:location}/include -I${zlib:location}/include
LDFLAGS=-L${gcc-java:location}/lib -Wl,-rpath=${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath=${gcc-java:location}/lib64 -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
LDFLAGS=-L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
......@@ -5,7 +5,6 @@ extends =
../libpng/buildout.cfg
../libtiff/buildout.cfg
../zlib/buildout.cfg
../gcc/buildout.cfg
parts =
tesseract-eng-traineddata-unzip
......@@ -28,10 +27,8 @@ configure-options =
--disable-static
--datarootdir=${tesseract-share:location}
environment =
PATH=${gcc-java:location}/bin:%(PATH)s
LD_LIBRARY_PATH=${gcc-java:location}/lib:${gcc-java:location}/lib64
CPPFLAGS=-I${zlib:location}/include -I${jbigkit:location}/include -I${libjpeg:location}/include -I${libtiff:location}/include -I${libpng:location}/include
LDFLAGS =-L${gcc-java:location}/lib -Wl,-rpath=${gcc-java:location}/lib -L${gcc-java:location}/lib64 -Wl,-rpath=${gcc-java:location}/lib64 -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${jbigkit:location}/lib -Wl,-rpath=${jbigkit:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib -L${libtiff:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
[tesseract-eng-traineddata]
recipe = hexagonit.recipe.download
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment