Title: [290117] trunk/Source
Revision
290117
Author
sbar...@apple.com
Date
2022-02-18 00:16:54 -0800 (Fri, 18 Feb 2022)

Log Message

Add LC_SOURCE_VERSION to compile targets
https://bugs.webkit.org/show_bug.cgi?id=236720
<rdar://84984140>

Reviewed by Michael Saboff.

Source/_javascript_Core:

* Configurations/JSC.xcconfig:
* Configurations/_javascript_Core.xcconfig:
* Configurations/TestAPI.xcconfig:
* Configurations/ToolExecutable.xcconfig:
* Configurations/Version.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:
* Configurations/Version.xcconfig:

Source/ThirdParty/libwebrtc:

* Configurations/Version.xcconfig:
* Configurations/boringssl.xcconfig:
* Configurations/libsrtp.xcconfig:
* Configurations/libvpx.xcconfig:
* Configurations/libwebm.xcconfig:
* Configurations/libwebrtc.xcconfig:
* Configurations/libyuv.xcconfig:
* Configurations/opus.xcconfig:
* Configurations/usrsctp.xcconfig:
* Configurations/yasm.xcconfig:

Source/WebCore:

* Configurations/Version.xcconfig:
* Configurations/WebCore.xcconfig:
* Configurations/WebCoreTestSupport.xcconfig:

Source/WebCore/PAL:

* Configurations/Version.xcconfig:

Source/WebGPU:

* Configurations/Version.xcconfig:
* Configurations/WGSL.xcconfig:
* Configurations/WGSLUnitTests.xcconfig:
* Configurations/WebGPU.xcconfig:

Source/WebInspectorUI:

* Configurations/Version.xcconfig:
* Configurations/WebInspectorUIFramework.xcconfig:

Source/WebKit:

* Configurations/GPUService.xcconfig:
* Configurations/NetworkService.xcconfig:
* Configurations/Version.xcconfig:
* Configurations/WebAuthnService.xcconfig:
* Configurations/WebContentService.xcconfig:
* Configurations/WebKit.xcconfig:
* Configurations/WebKitSwift.xcconfig:
* Configurations/adattributiond.xcconfig:
* Configurations/webpushd.xcconfig:
* Configurations/webpushtool.xcconfig:

Source/WebKitLegacy/mac:

* Configurations/Version.xcconfig:
* Configurations/WebKitLegacy.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (290116 => 290117)


--- trunk/Source/_javascript_Core/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,17 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/JSC.xcconfig:
+        * Configurations/_javascript_Core.xcconfig:
+        * Configurations/TestAPI.xcconfig:
+        * Configurations/ToolExecutable.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2022-02-17  Chris Dumez  <cdu...@apple.com>
 
         Clean up / optimize call sites constructing vectors

Modified: trunk/Source/_javascript_Core/Configurations/JSC.xcconfig (290116 => 290117)


--- trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/Configurations/JSC.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -25,7 +25,7 @@
 
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)$(_javascript_CORE_FRAMEWORKS_DIR)/$(_javascript_CORE_HELPERS_DIR);
 
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
 WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_YES = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=@executable_path/../../../..;
 

Modified: trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig (290116 => 290117)


--- trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/Configurations/_javascript_Core.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -29,7 +29,7 @@
 // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
 OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-unexported_symbol,__ZTISt9bad_alloc -Wl,-unexported_symbol,__ZTISt9exception -Wl,-unexported_symbol,__ZTSSt9bad_alloc -Wl,-unexported_symbol,__ZTSSt9exception -Wl,-unexported_symbol,__ZdlPvS_ -Wl,-unexported_symbol,__ZnwmPv -Wl,-unexported_symbol,__ZNKSt3__18functionIFvvEEclEv -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC1EOS2_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEEC2EOS2_ -Wl,-unexported_symbol,__ZNKSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEEclES3_S5_ -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvRN3JSC17BytecodeGeneratorEPNS1_10RegisterIDEEED2Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED1Ev -Wl,-unexported_symbol,__ZNSt3__18functionIFvvEED2Ev -Wl,-unexported_symbol,__ZTVNSt3__117bad_function_callE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE11__
 range_endES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE13__range_beginES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr27__is_cpp17_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIPKcEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE14__append_rangeIPKcEENS_9enable_ifIXsr21__is_forward_iteratorIT_EE5valueEvE4typeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEES8_S8_ -Wl,-unexported_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratordeEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iteratorppEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIA10_cPccLb1EE11__range_endEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs1
 0filesystem24__is_pathable_char_arrayIA10_cPccLb1EE13__range_beginEPKc -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4pathdVERKS2_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIcE15__append_sourceIA10_cEEvRNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEERKT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__throw_filesystem_errorIJRPKcRKNS1_4pathERKNS_10error_codeEEEEvDpOT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem14__is_separatorIcEENS_9enable_ifIXsr18__can_convert_charIT_EE5valueEbE4typeES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem24__is_pathable_char_arrayIPKcS4_cLb1EE15__first_or_nullES4_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path20__source_is_absoluteIcEEbT_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem4path6appendIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueERS2_E4typeERKS7_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem6u8pathIPKcEENS_9enable_ifIXsr13__is_pathableIT_EE5valueENS1_4pathEE4typeERKS6_ -W
 l,-unexported_symbol,__ZNKSt3__14__fs10filesystem18directory_iteratorptEv -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem18directory_iterator9incrementERNS_10error_codeE -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem20__is_pathable_stringINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEvE11__range_endERKS8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem20__is_pathable_stringINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEvE13__range_beginERKS8_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIDuE14__append_rangeERNS_12basic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEEEPKDuSC_ -Wl,-unexported_symbol,__ZNSt3__14__fs10filesystem8_PathCVTIDuE15__append_sourceINS_12basic_stringIDuNS_11char_traitsIDuEENS_9allocatorIDuEEEEEEvRNS5_IcNS6_IcEENS8_IcEEEERKT_;
 
-OTHER_LDFLAGS_BASE = $(OTHER_LDFLAGS_HIDE_SYMBOLS) -force_load "$(WTF_ARCHIVE)";
+OTHER_LDFLAGS_BASE = $(OTHER_LDFLAGS_HIDE_SYMBOLS) -force_load "$(WTF_ARCHIVE)" $(SOURCE_VERSION_LDFLAGS);
 OTHER_LDFLAGS[sdk=embedded*] = $(inherited) $(OTHER_LDFLAGS_BASE);
 OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_BASE) -framework CoreServices;
 

Modified: trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig (290116 => 290117)


--- trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/Configurations/TestAPI.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -47,5 +47,7 @@
 
 OTHER_CFLAGS = $(inherited) -isystem icu;
 
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);
+
 // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "${BUILT_PRODUCTS_DIR}/LLIntOffsets/${ARCHS}" "$(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders" $(inherited);

Modified: trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig (290116 => 290117)


--- trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/Configurations/ToolExecutable.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -55,3 +55,5 @@
 
 // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
 HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/_javascript_Core" "${BUILT_PRODUCTS_DIR}/LLIntOffsets/${ARCHS}" "$(_javascript_CORE_FRAMEWORKS_DIR)/_javascript_Core.framework/PrivateHeaders" $(inherited);
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/_javascript_Core/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/_javascript_Core/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (290116 => 290117)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,14 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/Version.xcconfig:
+
 2022-02-17  Kyle Piddington  <kpidding...@apple.com>
 
         Metal ANGLE: vertex array does not correctly observe contents of data buffers

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -101,7 +101,7 @@
 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES = $(ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
 ANGLE_INSTALL_PATH_PREFIX_DEPLOYMENT_YES_USE_ALTERNATE_YES = $(WK_ALTERNATE_FRAMEWORKS_DIR)/;
 
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_OTHER_LDFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_OTHER_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 LLVM_LTO = $(WK_LLVM_LTO_$(WK_XCODE_SUPPORTS_LTO));
 WK_LLVM_LTO_NO = NO;

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,22 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/boringssl.xcconfig:
+        * Configurations/libsrtp.xcconfig:
+        * Configurations/libvpx.xcconfig:
+        * Configurations/libwebm.xcconfig:
+        * Configurations/libwebrtc.xcconfig:
+        * Configurations/libyuv.xcconfig:
+        * Configurations/opus.xcconfig:
+        * Configurations/usrsctp.xcconfig:
+        * Configurations/yasm.xcconfig:
+
 2022-02-11  Youenn Fablet  <you...@apple.com>
 
         Support remote video frames in WebRTC video pipeline

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/boringssl.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -18,3 +18,5 @@
 
 // FIXME: There's no assembly used in the boringssl build yet :(
 GCC_PREPROCESSOR_DEFINITIONS = OPENSSL_NO_ASM $(inherited);
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libsrtp.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -15,3 +15,5 @@
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
 USE_HEADERMAP = NO;
 GCC_PREPROCESSOR_DEFINITIONS = V8_DEPRECATION_WARNINGS ENABLE_NOTIFICATIONS ENABLE_PLUGINS=1 ENABLE_PDF=1 ENABLE_PRINTING=1 ENABLE_BASIC_PRINTING=1 ENABLE_PRINT_PREVIEW=1 ENABLE_SPELLCHECK=1 USE_BROWSER_SPELLCHECKER=1 NO_TCMALLOC USE_EXTERNAL_POPUP_MENU=1 ENABLE_WEBRTC=1 ENABLE_EXTENSIONS=1 ENABLE_TASK_MANAGER=1 ENABLE_THEMES=1 ENABLE_SESSION_SERVICE=1 ENABLE_SUPERVISED_USERS=1 FULL_SAFE_BROWSING SAFE_BROWSING_CSD SAFE_BROWSING_DB_LOCAL CHROMIUM_BUILD ENABLE_MEDIA_ROUTER=1 FIELDTRIAL_TESTING_ENABLED CR_CLANG_REVISION=284979-1 CR_XCODE_VERSION=0820 __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 _DEBUG DYNAMIC_ANNOTATIONS_ENABLED=1 WTF_USE_DYNAMIC_ANNOTATIONS=1 PACKAGE_STRING="\"libsrtp2 2.0.0-pre\"" PACKAGE_VERSION="\"2.0.0-pre\"" HAVE_CONFIG_H OPENSSL HAVE_STDLIB_H HAVE_STRING_H HAVE_STDINT_H HAVE_INTTYPES_H HAVE_INT16_T HAVE_INT32_T HAVE_INT8_T HAVE_UINT16_T HAVE_UINT32_T HAVE_UINT64_T HAVE_UINT8_T HAVE_ARPA_INET
 _H HAVE_NETINET_IN_H HAVE_SYS_TYPES_H HAVE_UNISTD_H GCM $(inherited);
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libvpx.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -28,3 +28,5 @@
 EXCLUDED_SOURCE_FILE_NAMES_YES = *_sse4.c *_avx.c;
 EXCLUDED_SOURCE_FILE_NAMES[arch=arm64*] = $(X86_FILES) *_mmx.c
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphonesimulator*][arch=x86_64] = $(ARM_FILES) $(X86_FILES)
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebm.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -13,3 +13,5 @@
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/webm;
 USE_HEADERMAP = NO;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -89,5 +89,4 @@
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx);
 EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*][arch=arm64*] = $(EXCLUDED_SOURCE_FILE_NAMES_macosx) $(EXCLUDED_SOURCE_FILE_NAMES_arm);
 
-OTHER_LDFLAGS[sdk=macosx10.13*] = $(inherited);
-OTHER_LDFLAGS[sdk=macosx10.14*] = $(inherited);
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/libyuv.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -14,3 +14,5 @@
 INSTALL_PATH = $(INSTALL_PATH_PREFIX)/usr/local/lib;
 PUBLIC_HEADERS_FOLDER_PATH = $(INSTALL_PATH_PREFIX)/usr/local/include/libwebrtc;
 USE_HEADERMAP = NO;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/opus.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -29,3 +29,5 @@
 // The iOS Simulator and Catalyst can't use SSE4 intrinsics, but macOS can.
 SSE4_FLAG[sdk=macosx*] = $(SSE4_FLAG_$(WK_IS_CATALYST))
 SSE4_FLAG_NO = OPUS_X86_MAY_HAVE_SSE4_1;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/usrsctp.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -17,3 +17,5 @@
 WARNING_CFLAGS = -Wno-deprecated-declarations $(inherited);
 GCC_PREPROCESSOR_DEFINITIONS = SCTP_PROCESS_LEVEL_LOCKS SCTP_SIMPLE_ALLOCATOR SCTP_USE_OPENSSL_SHA1 __Userspace__ HAVE_SA_LEN HAVE_SCONN_LEN __APPLE_USE_RFC_2292 __Userspace_os_Darwin $(inherited);
 OTHER_CFLAGS = -UINET -UINET6;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig (290116 => 290117)


--- trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/yasm.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -45,3 +45,5 @@
 INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = main_noop.c;
 
 WK_ASAN_DISALLOWED = YES;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebCore/ChangeLog (290116 => 290117)


--- trunk/Source/WebCore/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,15 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WebCore.xcconfig:
+        * Configurations/WebCoreTestSupport.xcconfig:
+
 2022-02-17  Megan Gardner  <megan_gard...@apple.com>
 
         Draw highlights for Scroll To Text Fragment

Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebCore/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (290116 => 290117)


--- trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -145,7 +145,7 @@
 WK_SCENEKIT_LDFLAGS_macosx = -weak_framework SceneKit;
 
 // FIXME: Reduce the number of allowable_clients <rdar://problem/31823969>
-OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) -lsqlite3 -lobjc -allowable_client WebCoreTestSupport -allowable_client WebKitLegacy -force_load $(BUILT_PRODUCTS_DIR)/libPAL.a -framework CFNetwork -framework CoreAudio -framework CoreGraphics -framework CoreText -framework Foundation -framework IOSurface -framework ImageIO -framework Metal $(OTHER_LDFLAGS_PLATFORM_$(WK_COCOA_TOUCH)) $(OTHER_LDFLAGS_PLATFORM_$(WK_PLATFORM_NAME)) $(WK_ANGLE_LDFLAGS) $(WK_WEBGPU_LDFLAGS) $(WK_APPKIT_LDFLAGS) $(WK_APPSUPPORT_LDFLAGS) $(WK_AUDIO_UNIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_CORE_UI_LDFLAGS) $(WK_DATA_DETECTORS_CORE_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_IOSURFACE_ACCELERATOR_LDFLAGS) $(WK_LIBWEBRTC_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_NETWORK_EXTENSION_LD_FLAGS) $(WK_SYSTEM_CONFIGURATION_LDFLAGS) $(WK_CORE_IMAGE_LDFLAGS) $(WK_URL_FORMATTING_LDFLAGS) $(WK_SCENEKIT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 OTHER_LDFLAGS_PLATFORM_cocoatouch = -allowable_client WebKit -allowable_client iTunesU -allowable_client Casablanca -allowable_client Remote -allowable_client TVBooks -allowable_client DumpRenderTree -allowable_client WebKitTestRunner -allowable_client TestWebKitAPI;
 OTHER_LDFLAGS_PLATFORM_macosx = -sub_library libobjc -umbrella WebKit;

Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (290116 => 290117)


--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -58,10 +58,10 @@
 EXECUTABLE_PREFIX = lib;
 EXPORTED_SYMBOLS_FILE = ;
 GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_LDFLAGS) -framework Metal;
-OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit -framework Metal $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS);
+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(ANGLE_LDFLAGS) -framework Metal $(SOURCE_VERSION_LDFLAGS);
+OTHER_LDFLAGS[sdk=macos*] = $(ASAN_OTHER_LDFLAGS) -framework AppKit -framework Metal $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
-OTHER_LDFLAGS[sdk=iphone*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -framework CoreText -framework Metal $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS);
+OTHER_LDFLAGS[sdk=iphone*] = $(ASAN_OTHER_LDFLAGS) -lAccessibility -framework CoreText -framework Metal $(ANGLE_LDFLAGS) $(LIBWEBRTC_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 SECT_ORDER_FLAGS = ;
 
 ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))

Modified: trunk/Source/WebCore/PAL/ChangeLog (290116 => 290117)


--- trunk/Source/WebCore/PAL/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/PAL/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,13 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+
 2022-02-17  Kate Cheney  <katherine_che...@apple.com>
 
         Refactor share menu item presentation

Modified: trunk/Source/WebCore/PAL/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebCore/PAL/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebGPU/ChangeLog (290116 => 290117)


--- trunk/Source/WebGPU/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebGPU/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,16 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WGSL.xcconfig:
+        * Configurations/WGSLUnitTests.xcconfig:
+        * Configurations/WebGPU.xcconfig:
+
 2022-02-17  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [WebGPU] Add a playground example target

Modified: trunk/Source/WebGPU/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebGPU/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebGPU/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebGPU/Configurations/WGSL.xcconfig (290116 => 290117)


--- trunk/Source/WebGPU/Configurations/WGSL.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebGPU/Configurations/WGSL.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -27,3 +27,5 @@
 PUBLIC_HEADERS_FOLDER_PATH = $(WGSL_INSTALL_PATH_PREFIX)/usr/local/include;
 HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
 PRODUCT_NAME = wgsl;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig (290116 => 290117)


--- trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebGPU/Configurations/WGSLUnitTests.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -25,3 +25,5 @@
 PRODUCT_NAME = WGSLUnitTests;
 ENABLE_TESTABILITY = YES;
 GENERATE_INFOPLIST_FILE = YES;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebGPU/Configurations/WebGPU.xcconfig (290116 => 290117)


--- trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebGPU/Configurations/WebGPU.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -69,3 +69,5 @@
 
 SUPPORTS_TEXT_BASED_API = YES;
 TAPI_VERIFY_MODE = Pedantic;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebInspectorUI/ChangeLog (290116 => 290117)


--- trunk/Source/WebInspectorUI/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebInspectorUI/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,14 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WebInspectorUIFramework.xcconfig:
+
 2022-02-17  Nikita Vasilyev  <nvasil...@apple.com>
 
         Web Inspector: [Flexbox] Enable Flexbox Inspector feature

Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -16,3 +16,6 @@
 
 BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
 SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (290116 => 290117)


--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -45,3 +45,5 @@
 SUPPORTS_TEXT_BASED_API = YES;
 
 SKIP_INSTALL[sdk=iphone*] = YES;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebKit/ChangeLog (290116 => 290117)


--- trunk/Source/WebKit/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,22 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/GPUService.xcconfig:
+        * Configurations/NetworkService.xcconfig:
+        * Configurations/Version.xcconfig:
+        * Configurations/WebAuthnService.xcconfig:
+        * Configurations/WebContentService.xcconfig:
+        * Configurations/WebKit.xcconfig:
+        * Configurations/WebKitSwift.xcconfig:
+        * Configurations/adattributiond.xcconfig:
+        * Configurations/webpushd.xcconfig:
+        * Configurations/webpushtool.xcconfig:
+
 2022-02-17  Sihui Liu  <sihui_...@apple.com>
 
         Exclude new LocalStorage directory from backup on iOS

Modified: trunk/Source/WebKit/Configurations/GPUService.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/GPUService.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/GPUService.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -28,7 +28,7 @@
 INFOPLIST_FILE[sdk=embedded*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = GPUProcess/EntryPoint/Cocoa/XPCService/GPUService/Info-OSX.plist;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
 ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;

Modified: trunk/Source/WebKit/Configurations/NetworkService.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/NetworkService.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/NetworkService.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -28,8 +28,8 @@
 INFOPLIST_FILE[sdk=embedded*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
-OTHER_LDFLAGS[sdk=macosx*] = $(inherited)
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(SOURCE_VERSION_LDFLAGS);
 
 ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
 ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;

Modified: trunk/Source/WebKit/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebKit/Configurations/WebAuthnService.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/WebAuthnService.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/WebAuthnService.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -28,7 +28,7 @@
 INFOPLIST_FILE[sdk=embedded*] = WebAuthnProcess/EntryPoint/Cocoa/XPCService/WebAuthnService/Info-iOS.plist;
 INFOPLIST_FILE[sdk=macosx*] = WebAuthnProcess/EntryPoint/Cocoa/XPCService/WebAuthnService/Info-OSX.plist;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 ENTITLEMENTS_REQUIRED = $(ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_$(USE_INTERNAL_SDK))
 ENTITLEMENTS_REQUIRED_USE_INTERNAL_SDK_ = NO;

Modified: trunk/Source/WebKit/Configurations/WebContentService.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/WebContentService.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/WebContentService.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -36,7 +36,7 @@
 WK_APPKIT_LDFLAGS = $(WK_APPKIT_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_APPKIT_LDFLAGS_macosx = -framework AppKit;
 
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH_$(WK_WEBCONTENT_SERVICE_NEEDS_VERSIONED_FRAMEWORK_PATH_LDFLAG)) $(WK_APPKIT_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_$(WK_EMPTY_$(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT)));
 WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_ = $(WK_WEBCONTENT_SERVICE_NEEDS_XPC_DOMAIN_EXTENSION_ENTITLEMENT_NO);

Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -163,7 +163,7 @@
 LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(WEBCORE_FRAMEWORKS_DIR)/WebCore.framework/Versions/A/Frameworks;
 LIBWEBRTC_LIBRARY_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
 
-OTHER_LDFLAGS = $(inherited) -iframework"$(SDK_DIR)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks" $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) -iframework"$(SDK_DIR)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks" $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(WK_RELOCATABLE_FRAMEWORK_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 REEXPORTED_FRAMEWORK_NAMES = WebKitLegacy;
 REEXPORTED_FRAMEWORK_NAMES[sdk=macosx*] = $(inherited) WebCore;

Modified: trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/WebKitSwift.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -43,3 +43,5 @@
 EXCLUDED_SOURCE_FILE_NAMES = $(WK_EXCLUDED_COORDINATOR_FILES) $(EXCLUDED_IOS_RESOURCE_FILE_NAMES) $(EXCLUDED_MACOS_PLUGIN_FILE_NAMES)
 SWIFT_INSTALL_OBJC_HEADER = NO
 SWIFT_VERSION = 5.0;
+
+OTHER_LDFLAGS = $(inherited) $(SOURCE_VERSION_LDFLAGS);

Modified: trunk/Source/WebKit/Configurations/adattributiond.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/adattributiond.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -25,7 +25,7 @@
 
 PRODUCT_NAME = adattributiond;
 
-OTHER_LDFLAGS = -framework WebKit;
+OTHER_LDFLAGS = -framework WebKit $(SOURCE_VERSION_LDFLAGS);
 FRAMEWORK_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
 
 WK_PROCESSED_XCENT_FILE=$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).entitlements

Modified: trunk/Source/WebKit/Configurations/webpushd.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/webpushd.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/webpushd.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -25,7 +25,7 @@
 
 PRODUCT_NAME = webpushd;
 
-OTHER_LDFLAGS = -framework WebKit;
+OTHER_LDFLAGS = -framework WebKit $(SOURCE_VERSION_LDFLAGS);
 LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
 
 // We want this to always be NO for non-simulator builds. If set to YES, Xcode will invoke codesign with an --entitlements parameter that points to the platform's BaseEntitlements.plist. This parameter would override any --entitlements parameter that we establish in WK_LIBRARY_VALIDATION_CODE_SIGN_FLAGS, causing our entitlements to be ignored.

Modified: trunk/Source/WebKit/Configurations/webpushtool.xcconfig (290116 => 290117)


--- trunk/Source/WebKit/Configurations/webpushtool.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKit/Configurations/webpushtool.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -37,7 +37,7 @@
 WK_APPSERVERSUPPORT_LDFLAGS_iphonesimulator = $(WK_APPSERVERSUPPORT_LDFLAGS$(WK_IOS_15));
 WK_APPSERVERSUPPORT_LDFLAGS_IOS_SINCE_15 = -framework AppServerSupport;
 
-OTHER_LDFLAGS = -framework Foundation -framework CoreFoundation -framework WebKit -framework _javascript_Core $(WK_APPSERVERSUPPORT_LDFLAGS);
+OTHER_LDFLAGS = -framework Foundation -framework CoreFoundation -framework WebKit -framework _javascript_Core $(WK_APPSERVERSUPPORT_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
 
 CODE_SIGN_ENTITLEMENTS = Resources/webpushtool.entitlements;

Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (290116 => 290117)


--- trunk/Source/WebKitLegacy/mac/ChangeLog	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog	2022-02-18 08:16:54 UTC (rev 290117)
@@ -1,3 +1,14 @@
+2022-02-18  Saam Barati  <sbar...@apple.com>
+
+        Add LC_SOURCE_VERSION to compile targets
+        https://bugs.webkit.org/show_bug.cgi?id=236720
+        <rdar://84984140>
+
+        Reviewed by Michael Saboff.
+
+        * Configurations/Version.xcconfig:
+        * Configurations/WebKitLegacy.xcconfig:
+
 2022-02-17  Jean-Yves Avenard  <j...@apple.com>
 
         Unnecessary copy/memory allocation

Modified: trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig (290116 => 290117)


--- trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKitLegacy/mac/Configurations/Version.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -59,3 +59,6 @@
 
 DYLIB_COMPATIBILITY_VERSION = 1;
 DYLIB_CURRENT_VERSION = $(FULL_VERSION);
+
+SOURCE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION).$(NANO_VERSION);
+SOURCE_VERSION_LDFLAGS = -Xlinker -source_version -Xlinker $(SOURCE_VERSION);

Modified: trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig (290116 => 290117)


--- trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-02-18 07:55:32 UTC (rev 290116)
+++ trunk/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig	2022-02-18 08:16:54 UTC (rev 290117)
@@ -110,7 +110,7 @@
 WK_WEBINSPECTORUI_LDFLAGS = $(WK_WEBINSPECTORUI_LDFLAGS_$(WK_PLATFORM_NAME));
 WK_WEBINSPECTORUI_LDFLAGS_macosx = -weak_framework WebInspectorUI;
 
-OTHER_LDFLAGS = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS);
+OTHER_LDFLAGS = $(inherited) -lobjc -lsqlite3 -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework ImageIO -framework IOKit $(WK_APPKIT_LDFLAGS) $(WK_CARBON_LDFLAGS) $(WK_GRAPHICS_SERVICES_LDFLAGS) $(WK_MOBILE_CORE_SERVICES_LDFLAGS) $(WK_MOBILE_GESTALT_LDFLAGS) $(WK_SECURITY_INTERFACE_LDFLAGS) $(WK_WEBINSPECTORUI_LDFLAGS) $(SOURCE_VERSION_LDFLAGS);
 
 SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION));
 SECTORDER_FLAGS_Production[sdk=iphoneos*] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to