Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ROOT master] Get latest commits #5800

Closed
wants to merge 6 commits into from
Closed

[ROOT master] Get latest commits #5800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f80c00
Updated root to tip of branch master
mrodozov May 4, 2020
7b6fbf3
copy GL manually
mrodozov May 5, 2020
aa3ce24
add glew external and use it with ROOT, remove rootglew toolfile
mrodozov May 6, 2020
31be222
Update cmssw-tool-conf.spec
mrodozov May 6, 2020
08f8caa
get cmake fix
mrodozov May 7, 2020
8096f20
get root commits, remove glew refs from toofiles and add explicit Pro…
mrodozov May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions glew.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### RPM external glew 2.1.0
## INITENV SETV GLEW_SOURCE %{source0}
## INITENV SETV GLEW_STRIP_PREFIX %{source_prefix}

%define source0 https://github.com/nigels-com/glew/releases/download/%{n}-%{realversion}/%{n}-%{realversion}.tgz
%define source_prefix %{n}-%{realversion}
Provides: libGLEW.so.2.1()(64bit)
Source: %{source0}
BuildRequires: gmake

%prep
%setup -n %{source_prefix}
sed -i -e 's|GLEW_DEST)/lib64|GLEW_DEST)/lib|' ./config/Makefile.linux

%build

make -C auto
make %{makeprocesses}

%install

make install GLEW_DEST=%{i}

9 changes: 0 additions & 9 deletions root-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrgl.xml
<tool name="rootrgl" version="@TOOL_VERSION@">
<info url="http://root.cern.ch/root/"/>
<lib name="RGL"/>
<use name="rootglew"/>
<use name="rootgui"/>
<use name="rootinteractive"/>
<use name="rootgraphics"/>
Expand Down Expand Up @@ -461,14 +460,6 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/rootged.xml
</tool>
EOF_TOOLFILE

#Root GLEW
cat << \EOF_TOOLFILE >%i/etc/scram.d/rootglew.xml
<tool name="rootglew" version="@TOOL_VERSION@">
<info url="http://root.cern.ch/root/"/>
<lib name="GLEW"/>
</tool>
EOF_TOOLFILE

#Root Gui
cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgui.xml
<tool name="rootgui" version="@TOOL_VERSION@">
Expand Down
9 changes: 4 additions & 5 deletions root.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
## INITENV +PATH PYTHON3PATH %{i}/lib
## INITENV SET ROOTSYS %{i}

%define tag 384e06fed3d7305d8d438c34399d6e6e327256de
%define branch cms/master/73ae672
%define tag a2847019732b1b02e0cb1e437b4b9f4c913ddee1
%define branch cms/master/e2c9e16
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please open a new PR with only this change. All of other changes are needed now ... right?

Copy link
Contributor Author

@mrodozov mrodozov May 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll keep the branch if ROOT decide to ditch glew, apart from that yes no need to keep this one open. This is not merged yet so it also needs it root-project/root#5583

%define github_user cms-sw
Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

Expand All @@ -13,7 +13,7 @@ Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&expo

BuildRequires: cmake ninja

Requires: gsl libjpeg-turbo libpng libtiff giflib pcre python python3 fftw3 xz xrootd libxml2 openssl zlib davix tbb OpenBLAS py2-numpy py3-numpy lz4 freetype zstd
Requires: gsl libjpeg-turbo libpng libtiff giflib pcre python python3 fftw3 xz xrootd libxml2 openssl zlib davix tbb OpenBLAS py2-numpy py3-numpy lz4 freetype zstd glew

%if %islinux
Requires: dcap
Expand Down Expand Up @@ -79,7 +79,6 @@ cmake ../%{n}-%{realversion} \
-Dbuiltin_zlib=OFF \
-Dbuiltin_lzma=OFF \
-Dbuiltin_gsl=OFF \
-Dbuiltin_glew=ON \
-Dbuiltin_ftgl=ON \
-Dbuiltin_gl2ps=ON \
-Dbuiltin_afterimage=ON \
Expand Down Expand Up @@ -141,7 +140,7 @@ cmake ../%{n}-%{realversion} \
-DZLIB_ROOT="${ZLIB_ROOT}" \
-DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
-DZSTD_ROOT="${ZSTD_ROOT}" \
-DCMAKE_PREFIX_PATH="${LZ4_ROOT};${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${PYTHON3_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LIBXML2_ROOT};${ZSTD_ROOT}" \
-DCMAKE_PREFIX_PATH="${LZ4_ROOT};${GSL_ROOT};${XZ_ROOT};${OPENSSL_ROOT};${GIFLIB_ROOT};${FREETYPE_ROOT};${PYTHON_ROOT};${PYTHON3_ROOT};${LIBPNG_ROOT};${PCRE_ROOT};${TBB_ROOT};${OPENBLAS_ROOT};${DAVIX_ROOT};${LIBXML2_ROOT};${ZSTD_ROOT};${GLEW_ROOT}" \
-Dpyroot_experimental=ON

# For CMake cache variables: http://www.cmake.org/cmake/help/v3.2/manual/cmake-language.7.html#lists
Expand Down