-
Notifications
You must be signed in to change notification settings - Fork 374
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This makes waf compatible with Python 3.12 again. Also, apply modifications needed for MacOS and add as a patch file (see commits 0f2e3b2 and dc6c995). Signed-off-by: Nils Philippsen <nils@tiptoe.de>
- Loading branch information
Showing
40 changed files
with
2,114 additions
and
195 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
diff --git a/waflib/Tools/ccroot.py b/waflib/Tools/ccroot.py | ||
index cfef8bf5..484846f5 100644 | ||
--- a/waflib/Tools/ccroot.py | ||
+++ b/waflib/Tools/ccroot.py | ||
@@ -575,12 +575,10 @@ def apply_vnum(self): | ||
|
||
cnum = getattr(self, 'cnum', str(nums[0])) | ||
cnums = cnum.split('.') | ||
- if len(cnums)>len(nums) or nums[0:len(cnums)] != cnums: | ||
- raise Errors.WafError('invalid compatibility version %s' % cnum) | ||
|
||
libname = node.name | ||
if libname.endswith('.dylib'): | ||
- name3 = libname.replace('.dylib', '.%s.dylib' % self.vnum) | ||
+ name3 = libname.replace('.dylib', '.%s.dylib' % cnums[0]) | ||
name2 = libname.replace('.dylib', '.%s.dylib' % cnum) | ||
else: | ||
name3 = libname + '.' + self.vnum |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.