[131110] trunk/dports/www/serf1/files/patch-SConstruct.diff

[jeremyhu at macports.org]

Revision: 131110
          https://trac.macports.org/changeset/131110
Author:   jeremyhu at macports.org
Date:     2015-01-05 23:33:02 -0800 (Mon, 05 Jan 2015)
Log Message:
-----------
serf1: Don't use install_name_tool hack.  Set the dylib id correctly at build time

Modified Paths:
--------------
    trunk/dports/www/serf1/files/patch-SConstruct.diff

Modified: trunk/dports/www/serf1/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/www/serf1/files/patch-SConstruct.diff	2015-01-06 07:29:35 UTC (rev 131109)
+++ trunk/dports/www/serf1/files/patch-SConstruct.diff	2015-01-06 07:33:02 UTC (rev 131110)
@@ -12,3 +12,36 @@
  
  LIBNAME = 'libserf-%d' % (MAJOR,)
  if sys.platform != 'win32':
+--- SConstruct.orig	2015-01-05 22:48:24.000000000 -0800
++++ SConstruct	2015-01-05 22:49:39.000000000 -0800
+@@ -225,7 +225,7 @@ env.Append(RPATH=libdir,
+ 
+ if sys.platform == 'darwin':
+ #  linkflags.append('-Wl,-install_name, at 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' % (libdir, LIBNAME,))
+ 
+ if sys.platform != 'win32':
+   ### gcc only. figure out appropriate test / better way to check these
+@@ -402,21 +402,6 @@ if CALLOUT_OKAY:
+ install_static = env.Install(libdir, lib_static)
+ install_shared = env.InstallVersionedLib(libdir, lib_shared)
+ 
+-if sys.platform == 'darwin':
+-  # Change the shared library install name (id) to its final name and location.
+-  # Notes:
+-  # If --install-sandbox=<path> is specified, install_shared_path will point
+-  # to a path in the sandbox. We can't use that path because the sandbox is
+-  # only a temporary location. The id should be the final target path.
+-  # Also, we shouldn't use the complete version number for id, as that'll
+-  # make applications depend on the exact major.minor.patch version of serf.
+-
+-  install_shared_path = install_shared[0].abspath
+-  target_install_shared_path = os.path.join(libdir, '%s.dylib' % LIBNAME)
+-  env.AddPostAction(install_shared, ('install_name_tool -id %s %s'
+-                                     % (target_install_shared_path,
+-                                        install_shared_path)))
+-
+ env.Alias('install-lib', [install_static, install_shared,
+                           ])
+ env.Alias('install-inc', env.Install(incdir, HEADER_FILES))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150105/e8086fde/attachment.html>