Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
slapos
Commits
af65375c
Commit
af65375c
authored
Mar 26, 2020
by
Dmitry Blinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make default environment suffice for ldd
parent
bfb8d7f3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
component/proviewR/buildout.cfg
component/proviewR/buildout.cfg
+5
-2
component/qt/buildout.cfg
component/qt/buildout.cfg
+1
-1
No files found.
component/proviewR/buildout.cfg
View file @
af65375c
...
...
@@ -355,6 +355,8 @@ compile-dir = ${:location}__compile__/proview-${:version}*
configure-command =
set -e
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#(cross_compile)#(cross_compile) ${:rpaths} #" ${:compile-dir}/xtt/exe/wb_ge/qt/link_rule.mk
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
...
...
@@ -445,9 +447,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
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:${libX11: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:${freetype: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
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 -Wl,-rpath=${freetype
:location}/lib
...
...
component/qt/buildout.cfg
View file @
af65375c
...
...
@@ -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}
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=${: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
-L${libX11:location}/lib -L${libX11:location}/lib64 -Wl,-rpath=${libX11:location}/lib64 -Wl,-rpath=${libX11:location}/lib -L${libXext:location}/lib -Wl,-rpath=${libXext:location}/lib -L${freetype:location}/lib -Wl,-rpath=${freetype:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libpng:location}/lib -Wl,-rpath=${libpng:location}/lib
LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment