[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r4792: update root to 6.10.06
From: |
Carl Hansen |
Subject: |
[Gsrc-commit] trunk r4792: update root to 6.10.06 |
Date: |
Thu, 5 Oct 2017 20:00:22 -0400 (EDT) |
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 4792
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Thu 2017-10-05 17:00:18 -0700
message:
update root to 6.10.06
modified:
pkg/other/root/Makefile makefile-20161025063657-4wx3eeqz615u34a7-3
pkg/other/root/config.mk config.mk-20161025063657-4wx3eeqz615u34a7-2
=== modified file 'pkg/other/root/Makefile'
--- a/pkg/other/root/Makefile 2017-09-28 06:32:39 +0000
+++ b/pkg/other/root/Makefile 2017-10-06 00:00:18 +0000
@@ -32,7 +32,6 @@
endef
######################################################################
-# https://root.cern.ch/download/root_v6.10.02.source.tar.gz
MASTER_SITES = https://root.cern.ch/
MASTER_SUBDIR = download/
DISTFILES = $(GARNAME)_v$(GARVERSION).source.tar.gz
@@ -42,13 +41,14 @@
BUILDDEPS =
LIBDEPS =
+#openssl
WORKOBJ = $(WORKDIR)/$(DISTNAME)-build
-MAKE_CXX_FLAGS = -D_GLIBCXX_USE_CXX11_ABI=1
+#MAKE_CXX_FLAGS = -D_GLIBCXX_USE_CXX11_ABI=1
# libXpm and Xpm headers must be installed.
######################################################################
-CONFIGURE_OPTS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
+#CONFIGURE_OPTS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1
include ../../../gar/gar.lib/cmake.mk
# include ../../../gar/gar.lib/auto.mk
@@ -56,7 +56,8 @@
pre-configure:
mkdir -p $(WORKOBJ)
- (cd $(WORKOBJ); cmake ../$(DISTNAME) -Dgnuinstall=ON
-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 )
+ (cd $(WORKOBJ); cmake ../$(DISTNAME) -Dgnuinstall=ON )
$(MAKECOOKIE)
+# (cd $(WORKOBJ); cmake ../$(DISTNAME) -Dgnuinstall=ON
-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1 )
=== modified file 'pkg/other/root/config.mk'
--- a/pkg/other/root/config.mk 2016-10-25 06:37:36 +0000
+++ b/pkg/other/root/config.mk 2017-10-06 00:00:18 +0000
@@ -1,5 +1,5 @@
## Configuration options ##
-CONFIGURE_OPTS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
-#CONFIGURE_OPTS ?=
+#CONFIGURE_OPTS += -DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
+CONFIGURE_OPTS ?=
BUILD_OPTS ?=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r4792: update root to 6.10.06,
Carl Hansen <=