Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 382718 Details for
Bug 509242
net-libs/serf-1.3.5: RUNPATH broken
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch fixing the issue and possibly more
serf-1.3.7-list-vars.patch (text/plain), 3.49 KB, created by
Michał Górny
on 2014-08-12 08:23:08 UTC
(
hide
)
Description:
Patch fixing the issue and possibly more
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2014-08-12 08:23:08 UTC
Size:
3.49 KB
patch
obsolete
>--- serf-1.3.7/SConstruct 2014-02-04 21:11:10.000000000 +0100 >+++ serf-1.3.7.new/SConstruct 2014-08-12 10:20:15.934000000 +0200 >@@ -223,12 +223,12 @@ env.Append(RPATH=libdir, > > if sys.platform == 'darwin': > # linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,)) >- env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)) >+ env.Append(LINKFLAGS=['-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,)]) > > if sys.platform != 'win32': > ### gcc only. figure out appropriate test / better way to check these > ### flags, and check for gcc. >- env.Append(CFLAGS='-std=c89') >+ env.Append(CFLAGS=['-std=c89']) > > ### These warnings are not available on Solaris > if sys.platform != 'sunos5': >@@ -237,17 +237,17 @@ if sys.platform != 'win32': > '-Wall']) > > if debug: >- env.Append(CCFLAGS='-g') >+ env.Append(CCFLAGS=['-g']) > env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) > else: >- env.Append(CCFLAGS='-O2') >- env.Append(CPPDEFINES='NDEBUG') >+ env.Append(CCFLAGS=['-O2']) >+ env.Append(CPPDEFINES=['NDEBUG']) > > ### works for Mac OS. probably needs to change > env.Append(LIBS=['ssl', 'crypto', 'z', ]) > > if sys.platform == 'sunos5': >- env.Append(LIBS='m') >+ env.Append(LIBS=['m']) > else: > # Warning level 4, no unused argument warnings > env.Append(CCFLAGS=['/W4', '/wd4100']) >@@ -260,8 +260,8 @@ else: > else: > # Optimize for speed, use DLL runtime > env.Append(CCFLAGS=['/O2', '/MD']) >- env.Append(CPPDEFINES='NDEBUG') >- env.Append(LINKFLAGS='/RELEASE') >+ env.Append(CPPDEFINES=['NDEBUG']) >+ env.Append(LINKFLAGS=['/RELEASE']) > > # PLAN THE BUILD > SHARED_SOURCES = [] >@@ -309,23 +309,23 @@ if sys.platform == 'win32': > # zlib > env.Append(LIBS='zlib.lib') > if not env.get('SOURCE_LAYOUT', None): >- env.Append(CPPPATH='$ZLIB/include', >- LIBPATH='$ZLIB/lib') >+ env.Append(CPPPATH=['$ZLIB/include'], >+ LIBPATH=['$ZLIB/lib']) > else: >- env.Append(CPPPATH='$ZLIB', >- LIBPATH='$ZLIB') >+ env.Append(CPPPATH=['$ZLIB'], >+ LIBPATH=['$ZLIB']) > > # openssl > env.Append(LIBS=['libeay32.lib', 'ssleay32.lib']) > if not env.get('SOURCE_LAYOUT', None): >- env.Append(CPPPATH='$OPENSSL/include/openssl', >- LIBPATH='$OPENSSL/lib') >+ env.Append(CPPPATH=['$OPENSSL/include/openssl'], >+ LIBPATH=['$OPENSSL/lib']) > elif 0: # opensslstatic: >- env.Append(CPPPATH='$OPENSSL/inc32', >- LIBPATH='$OPENSSL/out32') >+ env.Append(CPPPATH=['$OPENSSL/inc32'], >+ LIBPATH=['$OPENSSL/out32']) > else: >- env.Append(CPPPATH='$OPENSSL/inc32', >- LIBPATH='$OPENSSL/out32dll') >+ env.Append(CPPPATH=['$OPENSSL/inc32'], >+ LIBPATH=['$OPENSSL/out32dll']) > else: > if os.path.isdir(apr): > apr = os.path.join(apr, 'bin', 'apr-1-config') >@@ -351,8 +351,8 @@ else: > apr_libs = '' > apu_libs = '' > >- env.Append(CPPPATH='$OPENSSL/include') >- env.Append(LIBPATH='$OPENSSL/lib') >+ env.Append(CPPPATH=['$OPENSSL/include']) >+ env.Append(LIBPATH=['$OPENSSL/lib']) > > > # If build with gssapi, get its information and define SERF_HAVE_GSSAPI >@@ -362,7 +362,7 @@ if gssapi and CALLOUT_OKAY: > env['GSSAPI_LIBS'] = cmd.strip() > return env.MergeFlags(cmd, unique) > env.ParseConfig('$GSSAPI --libs gssapi', parse_libs) >- env.Append(CPPDEFINES='SERF_HAVE_GSSAPI') >+ env.Append(CPPDEFINES=['SERF_HAVE_GSSAPI']) > if sys.platform == 'win32': > env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 509242
:
376128
| 382718