Skip to content
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.

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

Relocate libnotify Into a Seperate Module #1164

Merged
merged 3 commits into from
Apr 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,6 @@
[submodule "src/external/AvailabilityVersions"]
path = src/external/AvailabilityVersions
url = ../darling-AvailabilityVersions
[submodule "src/external/libnotify"]
path = src/external/libnotify
url = ../darling-Libnotify.git
2 changes: 1 addition & 1 deletion Developer/symlinks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ln -sf "$BUILD/src/kernel/libsystem_kernel.dylib" "$LIBS/system"
ln -sf "$BUILD/src/keymgr/libkeymgr.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libm/libsystem_m.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libinfo/libsystem_info.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libnotify/libsystem_notify.dylib" "$LIBS/system"
ln -sf "$BUILD/src/external/libnotify/libsystem_notify.dylib" "$LIBS/system"
ln -sf "$BUILD/src/external/libdispatch/libdispatch.dylib" "$LIBS/system"
ln -sf "$BUILD/src/external/compiler-rt/lib/builtins/libcompiler_rt.dylib" "$LIBS/system"
ln -sf "$BUILD/src/libunwind/libunwind.dylib" "$LIBS/system"
Expand Down
2 changes: 1 addition & 1 deletion cmake/use_ld64.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ FUNCTION(use_ld64 target)
-Wl,-dylib_file,/usr/lib/system/libremovefile.dylib:${CMAKE_BINARY_DIR}/src/libremovefile/libremovefile.dylib \
-Wl,-dylib_file,/usr/lib/system/libcopyfile.dylib:${CMAKE_BINARY_DIR}/src/copyfile/libcopyfile.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_coreservices.dylib:${CMAKE_BINARY_DIR}/src/libsystem_coreservices/libsystem_coreservices.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_notify.dylib:${CMAKE_BINARY_DIR}/src/libnotify/libsystem_notify_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_notify.dylib:${CMAKE_BINARY_DIR}/src/external/libnotify/libsystem_notify_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/system/libdispatch.dylib:${CMAKE_BINARY_DIR}/src/external/libdispatch/liblibdispatch_shared_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/system/libmacho.dylib:${CMAKE_BINARY_DIR}/src/external/cctools/libmacho/libmacho_firstpass.dylib \
-Wl,-dylib_file,/usr/lib/system/libsystem_sandbox.dylib:${CMAKE_BINARY_DIR}/src/sandbox/libsystem_sandbox.dylib \
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ add_subdirectory(networkextension)
add_subdirectory(external/libsystem)
add_subdirectory(libsystem_coreservices)
add_subdirectory(libutil)
add_subdirectory(libnotify)
add_subdirectory(external/libnotify)
add_subdirectory(libremovefile)
add_subdirectory(launchd)
add_subdirectory(keymgr)
Expand Down
1 change: 1 addition & 0 deletions src/external/libnotify
Submodule libnotify added at fac2a3
2 changes: 1 addition & 1 deletion src/external/libsystem
Submodule libsystem updated 1 files
+1 −1 CMakeLists.txt
372 changes: 0 additions & 372 deletions src/libnotify/APPLE_LICENSE

This file was deleted.

47 changes: 0 additions & 47 deletions src/libnotify/CMakeLists.txt

This file was deleted.

1,241 changes: 0 additions & 1,241 deletions src/libnotify/Libnotify.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

Loading