[Bug 214338] [PATCH] devel/glib20: new kqueue() backend for file monitoring

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214338

lightside <lightside at gmx.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #195450|maintainer-approval?(gnome@ |
              Flags|FreeBSD.org)                |
 Attachment #195450|0                           |1
        is obsolete|                            |
 Attachment #195597|                            |maintainer-approval?(gnome@
              Flags|                            |FreeBSD.org)

--- Comment #50 from lightside <lightside at gmx.com> ---
Created attachment 195597
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=195597&action=edit
Proposed patch (since 473551 revision)

(In reply to comment #48)
> To avoid playing with __FreeBSD_version I make always defined macro
Ok, I updated files/kqueue_fnm.c file based on your changes in attachment
#195570, but fixed spelling error for "compiler" word.

(In reply to comment #48)
> Your way to fix `make check-plist` is a bit hacky to me :)
The following sed patch:
@${REINPLACE_CMD} -e '/^libkqueue_la_OBJECTS
=/s|$$(am_libkqueue_la_OBJECTS)|libkqueue_la-gkqueuefilemonitor.lo
libkqueue_la-kqueue-helper.lo|' \
        ${WRKSRC}/gio/kqueue/Makefile.in

changes following line of ${WRKSRC}/gio/kqueue/Makefile.in file from:
libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)

to:
libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo
libkqueue_la-kqueue-helper.lo

This is because of other changes for am_libkqueue_la_OBJECTS variable in
files/patch-gio_filemonitor patch:
-8<--
--- gio/kqueue/Makefile.in.orig 2017-02-13 15:22:04 UTC
+++ gio/kqueue/Makefile.in
@@ -183,9 +183,8 @@ LTLIBRARIES = $(installed_test_LTLIBRARI
 libkqueue_la_LIBADD =
 am__objects_1 =
 am_libkqueue_la_OBJECTS = libkqueue_la-gkqueuefilemonitor.lo \
-       libkqueue_la-kqueue-helper.lo libkqueue_la-kqueue-thread.lo \
-       libkqueue_la-kqueue-sub.lo libkqueue_la-kqueue-missing.lo \
-       libkqueue_la-kqueue-utils.lo libkqueue_la-kqueue-exclusions.lo \
+       libkqueue_la-kqueue-helper.lo \
+       libkqueue_la-kqueue-missing.lo \
        libkqueue_la-dep-list.lo $(am__objects_1)
 libkqueue_la_OBJECTS = $(am_libkqueue_la_OBJECTS)
 AM_V_lt = $(am__v_lt_ at AM_V@)
-->8-

The "/^libkqueue_la_OBJECTS =/" fragment searches for line(s) which starts with
"libkqueue_la_OBJECTS =" text and
"s|$$(am_libkqueue_la_OBJECTS)|libkqueue_la-gkqueuefilemonitor.lo
libkqueue_la-kqueue-helper.lo|" fragment changes "$(am_libkqueue_la_OBJECTS)"
text to "libkqueue_la-gkqueuefilemonitor.lo libkqueue_la-kqueue-helper.lo", if
line(s) with "libkqueue_la_OBJECTS =" text was found. The
libkqueue_la-gkqueuefilemonitor.lo and libkqueue_la-kqueue-helper.lo have
available Makefile's rules for gkqueuefilemonitor.c and kqueue-helper.c files.
This is why the files/kqueue_fnm.c was copied to
${WRKSRC}/gio/kqueue/kqueue-helper.c, instead of
${WRKSRC}/gio/kqueue/kqueue_fnm.c.

(In reply to comment #48)
> In last patch I put patched/regenerated Makefile.in and now no need to do any
> patch or autoreconf operations.
This works, but may require to apply more changes for devel/glib20 port. I
think, the maintainer may decide about used approach. Attached modified patch.

Thanks for attention.

-- 
You are receiving this mail because:
You are on the CC list for the bug.