Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CDS
gentoo-overlay
Commits
e1477932
Commit
e1477932
authored
May 25, 2020
by
layman
Browse files
fix build for gds-root-extensions-2.19.0
parent
599437e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
sci-physics/gds-root-extensions/Manifest
View file @
e1477932
AUX gds-root-extensions-2.19.0-Makefile.am.patch 3312 BLAKE2B eaab0802d75a7e14dcd9345054bb125d6f3a86c75d62aa1511a5f970fb808beae94ccde4b8f5cfbc111a44a61318361667e14e19d6596dc7f980348be1d1de20 SHA512 85bbb8f2f582dda8fa7549f3bfff9feadf78693b7140a887836b2540004e2213cd8939870b5165bf8b85bbf519ac73b282e0af96c77e8ec0c6ea6ca0c43fda77
DIST gds-root-extensions-2.19.0.tar.gz 430529 BLAKE2B 05ff05c991621e3a1dd0e2e92a7b6cf39b04d38346c9869d6ae5b93539dd51c44a55fdede84939f93b744cde128025493a519c537bc733efa0b790a6c1086939 SHA512 ef891bf486180ab365374af0eb9553d74b997c6cfe46f42768aab53c336208ad3e57446d8041b0067fec40143bd5fe1fa232d6318c2d8c2b3f062739f5faf732
EBUILD gds-root-extensions-2.19.0.ebuild
1104
BLAKE2B
4a8c9ee2f403ce48ab9e9c2806747d98d4317f6d5330ad0a0a0891044582200352034da86ded522948152526b6d354c117c1994a35eb2cc2bb40c14ef991497d SHA512 0360a76f045a53da466201b266611c67a38c529e89aa68ebd02bfdef35ec91be13512590d8bebddd424f279bb191350781f1fd5f4df1eb603a2db
45
2
a81
14f6f
EBUILD gds-root-extensions-2.19.0.ebuild
937
BLAKE2B
ef782f8b9b78ea8df957885959fb3aeb3952a77a4df4a157179e9996691f66ebb15d3133c9e53cd3fd44f8fa415b911bf259c65d6d5e0dddaeedc8a116a90e07 SHA512 d1d6818b5c7c08a43148c4e3395ed7fa6a7b6ab8845dd189ac8c2b289d2ec54dd5bd9a1090fb5a739ca46e7e85cbdb1a0350caeef6b421c30fe0b6f4
45a81
53a
sci-physics/gds-root-extensions/files/gds-root-extensions-2.19.0-Makefile.am.patch
0 → 100644
View file @
e1477932
--- ./Base/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./Base/Makefile.am 2020-05-25 17:25:05.417723712 +0200
@@ -52,7 +52,7 @@
AM_CPPFLAGS += -I$(rootinc)
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(AM_CPPFLAGS) $(HEADERSDICT) \
$(DICTLINKDEF)
--- ./Containers/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./Containers/Makefile.am 2020-05-25 17:25:27.557325462 +0200
@@ -94,7 +94,7 @@
AM_CPPFLAGS += -I$(rootinc) -DR__ACCESS_IN_SYMBOL
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(AM_CPPFLAGS) \
$(HEADERSDICT) $(DICTLINKDEF)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE)
--- ./Triggers/events/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./Triggers/events/Makefile.am 2020-05-25 17:28:44.310673734 +0200
@@ -93,7 +93,7 @@
AM_CPPFLAGS += -I$(rootinc) -DR__ACCESS_IN_SYMBOL
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(INCLUDESDICT) $(HEADERSDICT)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE) $(RMFILE)
--- ./IO/framefast/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./IO/framefast/Makefile.am 2020-05-25 17:27:48.469155883 +0200
@@ -51,7 +51,7 @@
AM_CPPFLAGS += -I$(rootinc) -DR__ACCESS_IN_SYMBOL
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(DICTINCLUDES) $(HEADERSDICT) $(DICTLINKDEF)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE)
--- ./FrameIO/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./FrameIO/Makefile.am 2020-05-25 17:29:59.611720448 +0200
@@ -73,7 +73,7 @@
if root_dict
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(ROOTHDRS) $(DEPHEADERS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(filter -I%,$(AM_CPPFLAGS)) \
$(HEADERSDICT) $(DICTLINKDEF)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE)
--- ./Math/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./Math/Makefile.am 2020-05-25 17:26:19.535738432 +0200
@@ -58,7 +58,7 @@
AM_CPPFLAGS += -I$(rootinc)
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(AM_CPPFLAGS) $(HEADERSDICT) \
$(DICTLINKDEF)
--- ./SignalProcessing/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./SignalProcessing/Makefile.am 2020-05-25 17:29:15.529522290 +0200
@@ -134,7 +134,7 @@
AM_CPPFLAGS += -I$(rootinc) -DR__ACCESS_IN_SYMBOL
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) -p $(filter -I%, $(AM_CPPFLAGS)) \
$(HEADERSDICT)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE)
--- ./Triggers/trig/Makefile.am~ 2020-04-25 00:04:17.000000000 +0200
+++ ./Triggers/trig/Makefile.am 2020-05-25 17:28:19.439997721 +0200
@@ -56,7 +56,7 @@
AM_CPPFLAGS += -I$(rootinc)
AM_CXXFLAGS += $(rootcflags)
-$(SRCSDICT): $(DICTDEPENDS) $(DICTLINKDEF)
+$(SRCSDICT):
$(rootcint) -f $(SRCSDICT) $(DICTOPTS) $(AM_CPPFLAGS) $(HEADERSDICT) $(DICTLINKDEF)
CLEANFILES = $(SRCSDICT) $(SRCSDICT:%.cc=%.h) $(PCMFILE)
sci-physics/gds-root-extensions/gds-root-extensions-2.19.0.ebuild
View file @
e1477932
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI
=
5
PYTHON_COMPAT
=(
python2_7
)
inherit python-r1 eutils
inherit eutils
DESCRIPTION
=
"LIGO Global Diagnostics System, GDS control room tools and GUI libraries"
HOMEPAGE
=
"http://www.ligo-wa.caltech.edu/gds/"
SLOT
=
"0"
KEYWORDS
=
"~amd64"
IUSE
=
"+online +
dtt +dmt-runtime +python -
root-objects"
IUSE
=
"+online +root-objects"
SRC_URI
=
"http://software.ligo.org/lscsoft/source/
${
P
}
.tar.gz"
RESTRICT
=
"primaryuri"
REQUIRED_USE
=
"
${
PYTHON_REQUIRED_USE
}
"
RDEPEND
=
"
${
PYTHON_DEPS
}
sci-physics/gds
sci-physics/root"
...
...
@@ -33,7 +28,7 @@ DEPEND="${RDEPEND}
src_prepare
()
{
python_setup
epatch
"
${
FILESDIR
}
/
${
P
}
-Makefile.am.patch"
}
src_configure
()
{
...
...
@@ -41,9 +36,6 @@ src_configure() {
--build
=
x86_64-unknown-linux-gnu
\
--host
=
x86_64-unknown-linux-gnu
\
$(
use_enable online
)
\
$(
use_enable dtt
)
\
$(
use_enable dmt-runtime
)
\
$(
use_enable python
)
\
$(
use_enable root-objects
)
\
CFLAGS
=
-g
\
CXXFLAGS
=
"-g -std=c++1y"
...
...
Write
Preview
Supports
Markdown
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