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
adf12a9b
Commit
adf12a9b
authored
Apr 03, 2020
by
Dmitry Blinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
openjdk-partial (alsa fails)
parent
4ef12832
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
70 additions
and
8 deletions
+70
-8
component/java-openjdk/buildout.cfg
component/java-openjdk/buildout.cfg
+61
-0
component/proviewR/buildout.cfg
component/proviewR/buildout.cfg
+7
-6
software/proviewR/instance.cfg
software/proviewR/instance.cfg
+1
-1
software/proviewR/software.cfg
software/proviewR/software.cfg
+1
-1
No files found.
component/java-openjdk/buildout.cfg
0 → 100644
View file @
adf12a9b
[buildout]
extends =
../zlib/buildout.cfg
../cups/buildout.cfg
../../component/automake/buildout.cfg
../../component/xorg/buildout.cfg
parts =
java-openjdk
[bootstrap-jdk]
recipe = slapos.recipe.build:download-unpacked
url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
md5sum = f5da6f4dec81bdd2a096184ec1d69216
location = /tmp/bootstrap-jdk/
[java-openjdk]
recipe = slapos.recipe.cmmi
#url = https://hg.openjdk.java.net/jdk-updates/jdk12u/archive/390566f1850a.tar.gz
url = file:///srv/slapgrid/slappart9/srv/runner/390566f1850a.tar.gz
md5sum = 5ae2dcc44ebb9f012a53af21348453e0
CFLAGS = -I${libX11:location}/include -I${xproto:location}/include -I${xorgproto:location}/include -I${libXi:location}/include -I${libXtst:location}/include -I${libXext:location}/include -I${xextproto:location}/include -I${zlib:location}/include -I${libXrender:location}/include -I${libXrandr:location}/include -I${libXtst:location}/include -I${libXt:location}/include -I${cups:location}/include -I${fontconfig:location}/include -I${alsa:location}/include
CXXFLAGS = ${:CFLAGS}
LDFLAGS = -L${libX11:location}/lib -L${xproto:location}/lib -L${xorgproto:location}/lib -L${libXi:location}/lib -L${libXtst:location}/lib -L${libXext:location}/lib -L${xextproto:location}/lib -L${zlib:location}/lib -L${libXrandr:location}/lib -L${libXtst:location}/lib -L${libXt:location}/lib -L${libXrender:location}/lib -L${cups:location}/lib -L${fontconfig:location}/lib -L${alsa:location}/lib
rpaths =
configure-command = ./configure
pre-configure =
set -e
echo $PWD
chmod a+x ./configure
echo mode set
#openjdk configure ignores environment
configure-options =
PKG_CONFIG="${pkgconfig:location}/bin/pkg-config"
--x-includes='${libX11:location}/include'
--x-libraries='${libX11:location}/lib'
--with-stdc++lib=dynamic
--with-extra-cflags="${:CFLAGS}"
--with-extra-cxxflags="${:CXXFLAGS}"
--with-extra-ldflags="${:LDFLAGS}"
--with-boot-jdk='${bootstrap-jdk:location}'
--enable-unlimited-crypto
--disable-warnings-as-errors
--with-cups='${cups:location}'
--with-fontconfig='${fontconfig:location}'
--with-freetype='bundled'
--with-alsa='${alsa:location}'
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${libtool:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
component/proviewR/buildout.cfg
View file @
adf12a9b
...
@@ -18,6 +18,7 @@ extends =
...
@@ -18,6 +18,7 @@ extends =
../../component/cmake/buildout.cfg
../../component/cmake/buildout.cfg
../libdb/buildout.cfg
../libdb/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
../../component/java-openjdk/buildout.cfg
# ../../component/automake/buildout.cfg
# ../../component/automake/buildout.cfg
../gnutls/buildout.cfg
../gnutls/buildout.cfg
../python3/buildout.cfg
../python3/buildout.cfg
...
@@ -29,11 +30,11 @@ extends =
...
@@ -29,11 +30,11 @@ extends =
parts =
parts =
pwr
pwr
[java-
jdk]
#[java-open
jdk]
recipe = hexagonit.recipe.download
#
recipe = hexagonit.recipe.download
url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
#
url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
md5sum = f5da6f4dec81bdd2a096184ec1d69216
#
md5sum = f5da6f4dec81bdd2a096184ec1d69216
strip-top-level-dir = true
#
strip-top-level-dir = true
[doxygen]
[doxygen]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
@@ -438,7 +439,7 @@ make-targets =
...
@@ -438,7 +439,7 @@ make-targets =
make-options =
make-options =
-j1
-j1
environment =
environment =
PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${gcc:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-
open
jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
SHELL=/bin/bash
SHELL=/bin/bash
PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
LD_LIBRARY_PATH=${:ld-library-path}
LD_LIBRARY_PATH=${:ld-library-path}
...
...
software/proviewR/instance.cfg
View file @
adf12a9b
...
@@ -42,7 +42,7 @@ extra-context =
...
@@ -42,7 +42,7 @@ extra-context =
raw websockify_executable_location ${buildout:directory}/bin/websockify
raw websockify_executable_location ${buildout:directory}/bin/websockify
raw xorg_font_util ${xorg-font-util:location}
raw xorg_font_util ${xorg-font-util:location}
raw xvfb_bin ${xserver:location}/bin/Xvfb
raw xvfb_bin ${xserver:location}/bin/Xvfb
raw java_location ${java-jdk:location}
raw java_location ${java-
open
jdk:location}
raw proview_directory ${pwr:location}
raw proview_directory ${pwr:location}
raw proview_compile_dir ${pwr:compile-dir}
raw proview_compile_dir ${pwr:compile-dir}
raw ld_library_path ${pwr:ld-library-path}
raw ld_library_path ${pwr:ld-library-path}
...
...
software/proviewR/software.cfg
View file @
adf12a9b
...
@@ -44,7 +44,7 @@ recipe = slapos.recipe.template
...
@@ -44,7 +44,7 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
url = ${:_profile_base_location_}/instance.cfg
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
md5sum =
5b519edd585596d868746752fa79c81f
md5sum =
9f22bdfb1d7b8d1a5cffaaee82453b34
[download-base]
[download-base]
recipe = hexagonit.recipe.download
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