Skip to content

Commit

Permalink
emulators/virtualbox-ose: fix builds on CURRENT
Browse files Browse the repository at this point in the history
SAVENAME was retired by D36542 https://reviews.freebsd.org/D36542

Bug 267079 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=267079
involves failures to build four ports, for VirtualBox guest additions,
on FreeBSD-CURRENT:

    emulators/virtualbox-ose-additions
    emulators/virtualbox-ose-additions-legacy
    emulators/virtualbox-ose-additions-nox11
    emulators/virtualbox-ose-additions-nox11-legacy

Fix bug 267079 for CURRENT 1400068 and greater by hiding the use of
SAVENAME in patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vnops.c
for:

    emulators/virtualbox-ose
    emulators/virtualbox-ose-legacy

PR:                  : 267079
Author:              : mjg
Approved by:         : ports-committers (lwhsu), khng
Differential revision: https://reviews.freebsd.org/D37074
  • Loading branch information
mjguzik authored and grahamperrin committed Dec 19, 2022
1 parent 8bb0246 commit c35a710
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1413,9 +1413,11 @@
+ if (error != 0)
+ goto out;
+
+#if __FreeBSD_version < 1400068
+ /* Keep the component name in the buffer for
+ * future uses. */
+ cnp->cn_flags |= SAVENAME;
+#endif
+
+ error = EJUSTRETURN;
+ } else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1413,9 +1413,11 @@
+ if (error != 0)
+ goto out;
+
+#if __FreeBSD_version < 1400068
+ /* Keep the component name in the buffer for
+ * future uses. */
+ cnp->cn_flags |= SAVENAME;
+#endif
+
+ error = EJUSTRETURN;
+ } else
Expand Down

1 comment on commit c35a710

@grahamperrin
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.