Commit bfb8d7f3 authored by Dmitry Blinov's avatar Dmitry Blinov

add more rtpaths

parent 0626306d
...@@ -356,6 +356,7 @@ configure-command = ...@@ -356,6 +356,7 @@ configure-command =
set -e set -e
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#cflags\s*:= -c#cflags := ${:incdir} -c#" ${:compile-dir}/src/tools/bld/src/variables.mk sed -i "s#cflags\s*:= -c#cflags := ${:incdir} -c#" ${:compile-dir}/src/tools/bld/src/variables.mk
sed -i "s#linkflags := \$(cross_compile) #linkflags := \$(cross_compile) ${:rpaths} #" ${:compile-dir}/src/tools/bld/src/variables.mk
sed -i "s#cxxflags := \$(cflags)#cxxflags := -std=gnu++11 \$(cflags)#" ${:compile-dir}/src/tools/bld/src/variables.mk sed -i "s#cxxflags := \$(cflags)#cxxflags := -std=gnu++11 \$(cflags)#" ${:compile-dir}/src/tools/bld/src/variables.mk
sed -i "s#\$(\$(pred))#\$(shell expr \$(word) - 1)#" ${:compile-dir}/src/tools/pwre/src/dir_symbols.mk sed -i "s#\$(\$(pred))#\$(shell expr \$(word) - 1)#" ${:compile-dir}/src/tools/pwre/src/dir_symbols.mk
sed -i "s#typedef char cnv_tName\[200\]#typedef char cnv_tName\[300\]#" ${:compile-dir}/src/exe/co_convert/src/co_convert.cpp sed -i "s#typedef char cnv_tName\[200\]#typedef char cnv_tName\[300\]#" ${:compile-dir}/src/exe/co_convert/src/co_convert.cpp
...@@ -444,7 +445,10 @@ environment = ...@@ -444,7 +445,10 @@ environment =
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${gtk-2:location}/lib -L${zlib:location}/lib -Wl,-v LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${gettext:location}/lib -L${fontconfig:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${bison:location}/lib -L${libdb:location}/lib -L${gtk-2:location}/lib -L${zlib:location}/lib -Wl,-v
DISPLAY=:99 DISPLAY=:99
ld-library-path = ${alsa:location}/lib:${qt4-qmake:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${gtk-2:location}/lib:${pango:location}/lib:${cairo:location}/lib:${atk:location}/lib:${harfbuzz:location}/lib:${libXext:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${phonon-qt4:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${gcc:location}/lib:${gcc:location}/lib64:${fontconfig:location}/lib ld-library-path = ${alsa:location}/lib:${qt4-qmake:location}/lib:${libdb:location}/lib:${openssl:location}/lib:${gtk-2:location}/lib:${pango:location}/lib:${cairo:location}/lib:${atk:location}/lib:${harfbuzz:location}/lib:${libXext:location}/lib:${gdk-pixbuf:location}/lib:${gettext:location}/lib:${phonon-qt4:location}/lib:${pixman:location}/lib:${zlib:location}/lib:${libpng:location}/lib:${gcc:location}/lib:${gcc:location}/lib64:${fontconfig:location}/lib:${libX11:location}/lib
rpaths = -Wl,-rpath=${alsa:location}/lib -Wl,-rpath=${qt4-qmake:location}/lib -Wl,-rpath=${libdb:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${gtk-2:location}/lib -Wl,-rpath=${pango:location}/lib -Wl,-rpath=${cairo:location}/lib -Wl,-rpath=${atk:location}/lib -Wl,-rpath=${harfbuzz:location}/lib -Wl,-rpath=${libXext:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${phonon-qt4:location}/lib -Wl,-rpath=${pixman:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libpng:location}/lib -Wl,-rpath=${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib64 -Wl,-rpath=${glib:location}/lib -Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${libX11:location}/lib
[libvncserver] [libvncserver]
......
...@@ -97,7 +97,7 @@ environment = ...@@ -97,7 +97,7 @@ environment =
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends} PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig:${dbus:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${gtk-2:pkg_config_depends}
CPPFLAGS=-I${openssl-1.0:location}/include -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${kbproto:location}/include/ -I${inputproto:location}/include/ -I${libXi:location}/include/ -I${libXrandr:location}/include/ -I${libXcursor:location}/include/ -I${xfixes:location}/include/ -I${fixesproto:location}/include/ -I${renderproto:location}/include/ -I${glproto:location}/include/ CPPFLAGS=-I${openssl-1.0:location}/include -I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include -I${gtk-2:location}/include/gtk-2.0 -I${kbproto:location}/include/ -I${inputproto:location}/include/ -I${libXi:location}/include/ -I${libXrandr:location}/include/ -I${libXcursor:location}/include/ -I${xfixes:location}/include/ -I${fixesproto:location}/include/ -I${renderproto:location}/include/ -I${glproto:location}/include/
LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libXi:location}/lib -L${libXcursor:location}/lib -L${libXrandr:location}/lib -L${xfixes:location}/lib LDFLAGS=-L${gcc:location}/lib -Wl,-rpath=${gcc:location}/lib -L${gcc:location}/lib64 -Wl,-rpath=${gcc:location}/lib64 -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${gtk-2:location}/lib -Wl,-rpath=${gtk-2:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${:location}/lib -Wl,-rpath=${fontconfig:location}/lib -L${libXi:location}/lib -L${libXcursor:location}/lib -L${libXrandr:location}/lib -L${xfixes:location}/lib
LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib
......
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