diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /net/unison/files/patch-Makefile.OCaml | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'net/unison/files/patch-Makefile.OCaml')
| -rw-r--r-- | net/unison/files/patch-Makefile.OCaml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/net/unison/files/patch-Makefile.OCaml b/net/unison/files/patch-Makefile.OCaml deleted file mode 100644 index a215227ad1cc..000000000000 --- a/net/unison/files/patch-Makefile.OCaml +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.OCaml.orig 2024-02-18 15:03:04 UTC -+++ Makefile.OCaml -@@ -336,15 +336,9 @@ ifneq ($(findstring $(OSARCH),FreeBSD OpenBSD NetBSD D - ifneq ($(findstring $(OSARCH),FreeBSD OpenBSD NetBSD DragonFly),) - LIBINOTIFY_LIB:=-cclib '$(shell pkg-config --libs libinotify 2> /dev/null || printf ' -linotify')' - LIBINOTIFY_INC:=-ccopt '$(shell pkg-config --cflags libinotify 2> /dev/null)' -- FOUND_LIBINOTIFY := $(shell { printf '' > inotifytest__.ml ;\ -- $(CAMLC) $(CAMLCFLAGS) $(CAMLLDFLAGS) $(LIBINOTIFY_LIB) \ -- -o inotifytest__ inotifytest__.ml > /dev/null 2>&1 && printf true ; } ;\ -- rm -f inotifytest__.ml inotifytest__.cm[oix] inotifytest__.o inotifytest__ > /dev/null 2>&1) -- ifeq ($(FOUND_LIBINOTIFY), true) -- FSMDIR = fsmonitor/inotify -- $(NAME_FSM)$(EXEC_EXT): CAMLCFLAGS += $(LIBINOTIFY_INC) -- $(NAME_FSM)$(EXEC_EXT): CLIBS += $(LIBINOTIFY_LIB) -- endif -+ FSMDIR = fsmonitor/inotify -+ $(NAME_FSM)$(EXEC_EXT): CAMLCFLAGS += $(LIBINOTIFY_INC) -+ $(NAME_FSM)$(EXEC_EXT): CLIBS += $(LIBINOTIFY_LIB) - endif - - ifeq ($(OSARCH),SunOS) |