diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 00:37:59 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 00:37:59 +0000 |
| commit | d348a1378539d07d2cac554bd7c5f2e6e4043938 (patch) | |
| tree | 93646ac3983269e907c9610836284be0a69e4ec9 /databases/galera/files/patch-SConstruct | |
| parent | - Fix build on i386 (2 separate problems) (diff) | |
- Bump PORTREVISION
- Add USE_GCC=yes, fix mysql signal 11 crash
- Remove dependency on net/asio, use asio from devel/boost-libs
- Remove GARB option (linker problem - upstream notified)
- Fix errnos warnings
- Fix problem with 'ar' and pass RPATH properly
PR: 195457
Submitted by: amdmi3 (but all changes by maintainer)
Approved by: horia@racoviceanu.com (maintainer)
Diffstat (limited to 'databases/galera/files/patch-SConstruct')
| -rw-r--r-- | databases/galera/files/patch-SConstruct | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/databases/galera/files/patch-SConstruct b/databases/galera/files/patch-SConstruct new file mode 100644 index 000000000000..34bdde0e697d --- /dev/null +++ b/databases/galera/files/patch-SConstruct @@ -0,0 +1,21 @@ +--- ./SConstruct.orig 2014-08-01 16:33:09.000000000 -0400 ++++ ./SConstruct 2014-08-01 16:34:45.000000000 -0400 +@@ -153,7 +153,7 @@ + + # Initialize CPPFLAGS and LIBPATH from environment to get user preferences + env.Replace(CPPFLAGS = os.getenv('CPPFLAGS', '')) +-env.Replace(LIBPATH = [os.getenv('LIBPATH', '')]) ++env.Replace(RPATH = [os.getenv('RPATH', '')]) + + # Set -pthread flag explicitly to make sure that pthreads are + # enabled on all platforms. +@@ -165,6 +165,9 @@ + env.Append(CPPFLAGS = ' -I/usr/local/include ') + if sysname == 'sunos': + env.Replace(SHLINKFLAGS = '-shared ') ++ env.Replace(AR = 'ar') ++ env.Replace(ARFLAGS= 'r') ++ env.Replace(ARCOM = '$AR $ARFLAGS $TARGET $SOURCES') + + # Add paths is extra_sysroot argument was specified + extra_sysroot = ARGUMENTS.get('extra_sysroot', '') |