Skip to content

Fix mac-fsevents-pm to build and run on macOS beyond X #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix mac-fsevents-pm to build and run on macOS beyond X #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion 10.9-libcxx/stable/main/finkinfo/libs/perlmods/mac-fsevents-pm.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Revision: 1
Description: Monitor a directory structure for changes
License: Artistic
Maintainer: Steve Huff <[email protected]>
Type: perl (5.16.2 5.18.2 5.18.4 5.28.2 5.30.2 5.30.3)
Type: perl (5.16.2 5.18.2 5.18.4 5.28.2 5.30.2 5.30.3 5.34.1)
Distribution: <<
(%type_pkg[perl] = 5162) 10.9,
(%type_pkg[perl] = 5162) 10.10,
Expand All @@ -16,6 +16,8 @@ Distribution: <<
<<
Source: mirror:cpan:authors/id/R/RH/RHOELZ/Mac-FSEvents-%v.tar.gz
Source-Checksum: SHA256(231b0533e2af1dd914a79265b8c4c95e0738ccca8159c69f742965ac8cec4018)
PatchFile: %{ni}.patch
PatchFile-MD5: 3c0a1c5030687d2a9e42b270f61cc7c6
UpdatePOD: true
DocFiles: README Changes
InstallScript: <<
Expand Down
54 changes: 54 additions & 0 deletions 10.9-libcxx/stable/main/finkinfo/libs/perlmods/mac-fsevents-pm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
diff -Nurd Mac-FSEvents-0.14/MacVersion.pm.orig Mac-FSEvents-0.14/MacVersion.pm
--- Mac-FSEvents-0.14/MacVersion.pm.orig 2017-11-30 17:17:30
+++ Mac-FSEvents-0.14/MacVersion.pm 2024-11-08 19:22:04
@@ -9,7 +9,7 @@

sub osx_version {
my $os_version = qx(system_profiler SPSoftwareDataType);
- if($os_version =~ /System Version:.+(?:(10)\.(\d+)(?:\.(\d+))?)/) {
+ if($os_version =~ /System Version:.+(?:(1[0-5])\.(\d+)(?:\.(\d+))?)/) {
return ($1, $2, $3 || 0);
} else {
$os_version =~ s/^/> /gm;
diff -Nurd Mac-FSEvents-0.14/Makefile.PL.orig Mac-FSEvents-0.14/Makefile.PL
--- Mac-FSEvents-0.14/Makefile.PL.orig 2017-11-30 17:17:30
+++ Mac-FSEvents-0.14/Makefile.PL 2024-11-08 19:54:40
@@ -84,10 +84,10 @@

my ( $major, $minor, $release ) = osx_version();

-if($minor >= 6) {
+if($major >= 11 or $minor >= 6) {
push @names, 'kFSEventStreamCreateFlagIgnoreSelf';

- if($minor >= 7) {
+ if($major >= 11 or $minor >= 7) {
push @names, 'kFSEventStreamCreateFlagFileEvents';
}
}

diff -Nurd Mac-FSEvents-0.14/hints/darwin.pl.orig Mac-FSEvents-0.14/hints/darwin.pl
--- Mac-FSEvents-0.14/hints/darwin.pl.orig 2017-11-30 17:17:30
+++ Mac-FSEvents-0.14/hints/darwin.pl 2024-11-08 19:17:49
@@ -7,7 +7,7 @@
my ( $major, $minor, $release ) = osx_version();
my $os_version = join('.', $major, $minor);

- if($minor >= 5) { # Leopard and up
+ if($major > 10 or $minor >= 5) { # Leopard and up
my @directories = (
"/Developer/SDKs/MacOSX$os_version.sdk",
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$os_version.sdk",
@@ -27,7 +27,11 @@
die "No SDK found for your version of OS X. Please install Xcode.\n";
}

- $arch = "-arch x86_64 -arch i386 -isysroot $sysroot -mmacosx-version-min=$os_version";
+ if($major > 10) { # Big Sur and up
+ $arch = "-arch x86_64 -arch arm64 -isysroot $sysroot -mmacosx-version-min=$os_version";
+ } else {
+ $arch = "-arch x86_64 -arch i386 -isysroot $sysroot -mmacosx-version-min=$os_version";
+ }
} else {
$arch = "-arch i386 -arch ppc";
}