d348a13785
- 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)
21 lines
812 B
Text
21 lines
812 B
Text
--- ./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', '')
|