summaryrefslogtreecommitdiff
path: root/www/serf/patches/patch-SConstruct
blob: 035f0099cccf235816f5a5e83cf6d1081400aec2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
$NetBSD: patch-SConstruct,v 1.2 2013/09/17 14:01:01 adam Exp $

Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin.
Don't append -O2 compiler flag.

--- SConstruct.orig	2013-09-11 09:42:09.000000000 +0000
+++ SConstruct
@@ -146,7 +146,7 @@ if sys.platform == 'win32':
                  True),
     )
 
-env = Environment(variables=opts,
+env = Environment(variables=opts, ENV=os.environ,
                   tools=('default', 'textfile',),
                   CPPPATH=['.', ],
                   )
@@ -238,7 +238,6 @@ if sys.platform != 'win32':
     env.Append(CCFLAGS='-g')
     env.Append(CPPDEFINES=['DEBUG', '_DEBUG'])
   else:
-    env.Append(CCFLAGS='-O2')
     env.Append(CPPDEFINES='NDEBUG')
 
   ### works for Mac OS. probably needs to change
@@ -401,7 +400,7 @@ if sys.platform == 'darwin':
   # to a path in the sandbox. The shared library install name (id) should be the
   # final targat path.
   install_shared_path = install_shared[0].abspath
-  target_install_shared_path = os.path.join(libdir, lib_shared[0].name)
+  target_install_shared_path = os.path.join('$OPENSSL', lib_shared[0].name)
   env.AddPostAction(install_shared, ('install_name_tool -id %s %s'
                                      % (target_install_shared_path,
                                         install_shared_path)))