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
ec069ffa
Commit
ec069ffa
authored
Dec 09, 2019
by
Alain Takoudjou
Committed by
Dmitry Blinov
Apr 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
proview-r: add more dependencies for compilation
parent
e3c9b76a
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
344 additions
and
31 deletions
+344
-31
component/proviewR/buildout.cfg
component/proviewR/buildout.cfg
+334
-27
component/qt/buildout.cfg
component/qt/buildout.cfg
+5
-3
software/proviewR/software.cfg
software/proviewR/software.cfg
+5
-1
No files found.
component/proviewR/buildout.cfg
View file @
ec069ffa
This diff is collapsed.
Click to expand it.
component/qt/buildout.cfg
View file @
ec069ffa
...
...
@@ -3,6 +3,7 @@ extends =
../xorg/buildout.cfg
../gcc/buildout.cfg
../openssl/buildout.cfg
../dbus/buildout.cfg
parts =
qt4-qmake
...
...
@@ -77,6 +78,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
url = http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
md5sum = d990ee66bf7ab0c785589776f35ba6ad
# see https://github.com/NixOS/nixpkgs/blob/3e387c3e005c87566b5403d24c86f71f4945a79b/pkgs/development/libraries/qt-4.x/4.8/default.nix#L101
version = 4.8.7
pre-configure =
set -x
sed 's,/usr/X11R6/lib64,${libX11:location}/lib64 ${xproto:location}/lib64 ${libXext:location}/lib64,g' -i mkspecs/*/*.conf
...
...
@@ -84,17 +86,17 @@ pre-configure =
sed 's,/usr/X11R6/include,${libX11:location}/include ${xproto:location}/include ${libXext:location}/include,g' -i mkspecs/*/*.conf
# sed 's,/usr/local/include,${openssl-1.0:location}/include,g' -i mkspecs/*/*.conf
# sed 's,/usr/local/lib,${openssl-1.0:location}/lib,g' -i mkspecs/*/*.conf
configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info -release -no-fast -confirm-license -opensource -
no-pc
h
configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info -release -no-fast -confirm-license -opensource -
dbus -gtkstyle -no-pch -no-rpat
h
#make-targets = qmake
#post-install =
# cp -rt ${:location}
environment =
PATH=${pkgconfig:location}/bin:${gcc:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl-1.0:location}/lib/pkgconfig
:${dbus:location}/lib/pkgconfig
CPPFLAGS=-I${openssl-1.0: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
# CFLAGS=-std=c++0x
LD_LIBRARY_PATH=${:location}__compile__/qt-everywhere-opensource-src-${:version}/lib
[qt4.8-qmake]
<= qt4-qmake
...
...
software/proviewR/software.cfg
View file @
ec069ffa
...
...
@@ -8,7 +8,11 @@ extends =
parts +=
slapos-cookbook
open62541
proviewR
pwr
x11vnc
xorg-font-adobe-75dpi
xorg-font-adobe-100dpi
xorg-font-type1
#[java-jdk]
#recipe = hexagonit.recipe.download
...
...
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