Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../serf-1.3.4/SConstruct ./SConstruct |
2 | --- ../serf-1.3.4/SConstruct 2014-02-04 21:11:10.000000000 +0100 | |
3 | +++ ./SConstruct 2014-02-19 13:11:56.000000000 +0100 | |
4 | @@ -149,6 +149,7 @@ | |
5 | env = Environment(variables=opts, | |
6 | tools=('default', 'textfile',), | |
7 | CPPPATH=['.', ], | |
8 | + PLATFORM='posix' | |
9 | ) | |
10 | ||
11 | env.Append(BUILDERS = { | |
12 | @@ -210,7 +211,7 @@ | |
13 | # Unfortunately we can't set the .dylib compatibility_version option separately | |
14 | # from current_version, so don't use the PATCH level to avoid that build and | |
15 | # runtime patch levels have to be identical. | |
16 | -env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) | |
17 | +env['SHLIBSUFFIX'] = '.so' | |
18 | ||
19 | LIBNAME = 'libserf-%d' % (MAJOR,) | |
20 | if sys.platform != 'win32': | |
21 | @@ -221,14 +222,14 @@ | |
22 | env.Append(RPATH=libdir, | |
23 | PDB='${TARGET.filebase}.pdb') | |
24 | ||
25 | -if sys.platform == 'darwin': | |
26 | +if sys.platform == 'darwin_disabled': | |
27 | # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) | |
28 | env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) | |
29 | ||
30 | if sys.platform != 'win32': | |
31 | ### gcc only. figure out appropriate test / better way to check these | |
32 | ### flags, and check for gcc. | |
33 | - env.Append(CFLAGS='-std=c89') | |
34 | + #env.Append(CFLAGS='-std=c89') | |
35 | ||
36 | ### These warnings are not available on Solaris | |
37 | if sys.platform != 'sunos5': | |
38 | @@ -400,7 +401,7 @@ | |
39 | install_static = env.Install(libdir, lib_static) | |
40 | install_shared = env.InstallVersionedLib(libdir, lib_shared) | |
41 | ||
42 | -if sys.platform == 'darwin': | |
43 | +if sys.platform == 'darwin_disabled': | |
44 | # Change the shared library install name (id) to its final name and location. | |
45 | # Notes: | |
46 | # If --install-sandbox=<path> is specified, install_shared_path will point |