forked from mirrors/nixpkgs
serf: use latest scons
This commit is contained in:
parent
544139a32b
commit
6a2f310e12
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchurl, apr, sconsPackages, openssl, aprutil, zlib, kerberos
|
||||
{ lib, stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
|
||||
, pkg-config, libiconv }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ];
|
||||
nativeBuildInputs = [ pkg-config scons ];
|
||||
buildInputs = [ apr openssl aprutil zlib libiconv ]
|
||||
++ lib.optional (!stdenv.isCygwin) kerberos;
|
||||
|
||||
|
|
|
@ -1,7 +1,16 @@
|
|||
diff --git a/SConstruct b/SConstruct
|
||||
index 4358a23..0d862e7 100644
|
||||
index 4358a23..6ce7776 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -55,7 +55,7 @@ def RawListVariable(key, help, default):
|
||||
# To be used to ensure a PREFIX directory is only created when installing.
|
||||
def createPathIsDirCreateWithTarget(target):
|
||||
def my_validator(key, val, env):
|
||||
- build_targets = (map(str, BUILD_TARGETS))
|
||||
+ build_targets = (list(map(str, BUILD_TARGETS)))
|
||||
if target in build_targets:
|
||||
return PathVariable.PathIsDirCreate(key, val, env)
|
||||
else:
|
||||
@@ -155,6 +155,7 @@ if sys.platform == 'win32':
|
||||
env = Environment(variables=opts,
|
||||
tools=('default', 'textfile',),
|
||||
|
@ -10,3 +19,25 @@ index 4358a23..0d862e7 100644
|
|||
)
|
||||
|
||||
env.Append(BUILDERS = {
|
||||
@@ -163,9 +164,9 @@ env.Append(BUILDERS = {
|
||||
suffix='.def', src_suffix='.h')
|
||||
})
|
||||
|
||||
-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
|
||||
- 'SERF_MINOR_VERSION ([0-9]+).*'
|
||||
- 'SERF_PATCH_VERSION ([0-9]+)',
|
||||
+match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
|
||||
+ b'SERF_MINOR_VERSION ([0-9]+).*'
|
||||
+ b'SERF_PATCH_VERSION ([0-9]+)',
|
||||
env.File('serf.h').get_contents(),
|
||||
re.DOTALL)
|
||||
MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
|
||||
@@ -183,7 +184,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help'))
|
||||
|
||||
unknown = opts.UnknownVariables()
|
||||
if unknown:
|
||||
- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
|
||||
+ print('Warning: Used unknown variables:', ', '.join(list(unknown.keys())))
|
||||
|
||||
apr = str(env['APR'])
|
||||
apu = str(env['APU'])
|
||||
|
|
Loading…
Reference in a new issue