1361b0d800
Drop patch previously backported: root-doxygen-endof-part1.patch Drop patch accepted upstream: root-python2-compat.patch Add back line accidentally removed in root-config Install headers in new PyROOT with COMPONENT headers Increase test timeout for ppc64le
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From d589c5f31f940ea6a3a5144ca1664b2ec9ea7d38 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Wed, 19 Aug 2020 20:08:32 +0200
|
|
Subject: [PATCH] Add back line accidentally removed in commit
|
|
17bc17715524b4cc6b46324c428845e9ab945684
|
|
|
|
---
|
|
config/root-config.in | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/config/root-config.in b/config/root-config.in
|
|
index d86b7d35af..7029439362 100755
|
|
--- a/config/root-config.in
|
|
+++ b/config/root-config.in
|
|
@@ -438,7 +438,9 @@ Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version]\
|
|
[--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs]\
|
|
[--evelibs] [--bindir] [--libdir] [--incdir] [--etcdir] [--tutdir] [--srcdir]\
|
|
[--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch]\
|
|
-[--python-version] [--python2-version] [--python3-version] [--cc] [--cxx] [--f77] [--ld ] [--help]"
|
|
+ [--platform] [--config] [--features] [--ncpu] [--git-revision]\
|
|
+ [--python-version] [--python2-version] [--python3-version]\
|
|
+ [--cc] [--cxx] [--f77] [--ld ] [--help]"
|
|
|
|
if test $# -eq 0; then
|
|
echo "${usage}" 1>&2
|
|
--
|
|
2.26.2
|
|
|