Bug 253791 - net/vde2: fix build with "WITH_DEBUG"
Summary: net/vde2: fix build with "WITH_DEBUG"
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Fernando Apesteguía
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-02-23 11:34 UTC by Michael Zhilin
Modified: 2021-03-09 06:48 UTC (History)
1 user (show)

See Also:


Attachments
SVN diff (2.26 KB, patch)
2021-02-23 11:34 UTC, Michael Zhilin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Zhilin freebsd_committer freebsd_triage 2021-02-23 11:34:32 UTC
Created attachment 222754 [details]
SVN diff

Hi,

This patch adds "static" for inline function to fix build in case of "WITH_DEBUG". Compiler use "inline" as hint, so in case of no optimizations it ignore inlining.

Testport is done for 12.2 and 13.0-BETA1.
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2021-02-25 06:53:56 UTC
^Triage: [tags] in issue Titles are deprecated.               
                                                                                                                             
^Triage: Simplifying title
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2021-02-25 11:12:18 UTC
It fails to patch for me:

===>  Patching for vde2-2.3.2_5
===>  Applying FreeBSD patches for vde2-2.3.2_5 from /usr/ports/net/vde2/files
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to src/vde_l3/vde_l3.c.rej
===>  FAILED Applying FreeBSD patch-src_vde__l3_vde__l3.c
===> Cleanly applied FreeBSD patch(es)  patch-src__dpipe.c patch-src_vde__cryptcab_cryptcab.c
===> FAILED to apply cleanly FreeBSD patch(es)  patch-src_vde__l3_vde__l3.c
*** Error code 1

Can you check it?

Thanks!
Comment 3 Michael Zhilin freebsd_committer freebsd_triage 2021-03-06 14:58:09 UTC
It's strange. I can't find out it happen sometimes. 

Shortly speaking patch works for me, but sometimes it fails to apply.

 # patch -p0 -i /usr/home/mizhka/temp/20210306/vde2.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: files/patch-src_vde__l3_vde__l3.c
|===================================================================
|--- files/patch-src_vde__l3_vde__l3.c  (nonexistent)
|+++ files/patch-src_vde__l3_vde__l3.c  (working copy)
--------------------------
(Creating file files/patch-src_vde__l3_vde__l3.c...)
Patching file files/patch-src_vde__l3_vde__l3.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|Property changes on: files/patch-src_vde__l3_vde__l3.c
|___________________________________________________________________
|Added: fbsd:nokeywords
|## -0,0 +1 ##
|+yes
|\ No newline at end of property
|Added: svn:eol-style
|## -0,0 +1 ##
|+native
|\ No newline at end of property
|Added: svn:mime-type
|## -0,0 +1 ##
|+text/plain
|\ No newline at end of property
|Index: files/patch-src_vde__switch_fstp.c
|===================================================================
|--- files/patch-src_vde__switch_fstp.c (nonexistent)
|+++ files/patch-src_vde__switch_fstp.c (working copy)
--------------------------
(Creating file files/patch-src_vde__switch_fstp.c...)
Patching file files/patch-src_vde__switch_fstp.c using Plan A...
Empty context always matches.
Hunk #1 succeeded at 1.
Hmm...  Ignoring the trailing garbage.
done
 # make clean patch
===>  Cleaning for vde2-2.3.2_5
===>   NOTICE:

The vde2 port currently does not have a maintainer. As a result, it is
more likely to have unresolved issues, not be up-to-date, or even be removed in
the future. To volunteer to maintain this port, please create an issue at:

https://bugs.freebsd.org/bugzilla

More information about port maintainership is available at:

https://www.freebsd.org/doc/en/articles/contributing/ports-contributing.html#maintain-port

===>  License BSD3CLAUSE GPLv2 LGPL21 accepted by the user
===>   vde2-2.3.2_5 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by vde2-2.3.2_5 for building
===>  Extracting for vde2-2.3.2_5
=> SHA256 Checksum OK for vde2-2.3.2.tar.gz.
===>  Patching for vde2-2.3.2_5
===>  Applying FreeBSD patches for vde2-2.3.2_5 from /usr/ports/net/vde2/files

Can you check again?

Thanks!
Comment 4 commit-hook freebsd_committer freebsd_triage 2021-03-09 06:48:40 UTC
A commit references this bug:

Author: fernape
Date: Tue Mar  9 06:48:03 UTC 2021
New revision: 567898
URL: https://svnweb.freebsd.org/changeset/ports/567898

Log:
  net/vde2: fix build with "WITH_DEBUG"

  PR:	253791
  Submitted by:	mizhka@gmail.com

Changes:
  head/net/vde2/files/patch-src_vde__l3_vde__l3.c
  head/net/vde2/files/patch-src_vde__switch_fstp.c
Comment 5 Fernando Apesteguía freebsd_committer freebsd_triage 2021-03-09 06:48:59 UTC
Committed,

Thanks!

P.S: Maybe I was groggy, but I swear the patch didn't work for me... but now it does.