Ticket #44068: patch-SConstruct.diff

SConstruct

@@ -210 +210 @@
 # Unfortunately we can't set the .dylib compatibility_version option separately
 # from current_version, so don't use the PATCH level to avoid that build and
 # runtime patch levels have to be identical.
-env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0)
+
+# MacPorts: change PATCH to 0 when MINOR goes from 3 to 4.
+env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, PATCH)
 
 LIBNAME = 'libserf-%d' % (MAJOR,)
 if sys.platform != 'win32':
@@ -222 +224 @@
            PDB='${TARGET.filebase}.pdb')
 
 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,))
+# MacPorts: ld on Tiger (at least) uses -dylib_install_name as its option.
+#  linkflags.append('-Wl,-dylib_install_name,@executable_path/%s.dylib' % (LIBNAME,))
+  env.Append(LINKFLAGS='-Wl,-dylib_install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
 
 if sys.platform != 'win32':
   ### gcc only. figure out appropriate test / better way to check these