From 55c6a30f1ebdf6becbad274f38e951ca13f0a785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 11 Sep 2019 14:42:15 +0200 Subject: scons: Replace deprecated Options with Variables. This resolves FTBFS with SCons >= 3.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- admin/generic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'admin/generic.py') diff --git a/admin/generic.py b/admin/generic.py index e0fa6b1..1897bf0 100644 --- a/admin/generic.py +++ b/admin/generic.py @@ -56,10 +56,10 @@ ie: """+BOLD+"""scons configure debug=full prefix=/usr/local extraincludes=/tmp/ print(CYAN+'** Enabling DESTDIR for the project ** ' + NORMAL + env['DESTDIR']) # load the options - from SCons.Options import Options, PathOption + from SCons.Variables import Variables cachefile=env['CACHEDIR']+'generic.cache.py' - opts = Options(cachefile) - opts.AddOptions( + opts = Variables(cachefile) + opts.AddVariables( ( 'KDECCFLAGS', 'C flags' ), ( 'KDECXXFLAGS', 'debug level for the project : full or just anything' ), ( 'KDELINKFLAGS', 'additional link flags' ), -- cgit v1.2.1