Re: git: 06b93ef8cda2 - main - unbound: Fix config.h
- In reply to: Cy Schubert : "git: 06b93ef8cda2 - main - unbound: Fix config.h"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 15 Jan 2023 07:28:05 UTC
In message <202301150709.30F79o8E042960@gitrepo.freebsd.org>, Cy Schubert write s: > The branch main has been updated by cy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=06b93ef8cda227d755d7f6cfa95d08c0 > ccc9dc2d > > commit 06b93ef8cda227d755d7f6cfa95d08c0ccc9dc2d > Author: Cy Schubert <cy@FreeBSD.org> > AuthorDate: 2023-01-15 06:55:05 +0000 > Commit: Cy Schubert <cy@FreeBSD.org> > CommitDate: 2023-01-15 07:06:40 +0000 > > unbound: Fix config.h > > FreeBSD src does not support HAVE_DECL_EVSIGNAL_ASSIGN. While reviewing > the new config.h after regenerating it, this definition was not removed. > > Updating config.h is a manual process of configuring the port and > copying/merging the generated config.h into src. This definition was > missed and not removed (#undef'd). > > Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 > MFC after: 1 month > X-MFC with: 1838dec31895fd4752fa8631322ab93be0705a66 > --- > usr.sbin/unbound/config.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h > index 7ea0d3151ac5..bd36bb7573f8 100644 > --- a/usr.sbin/unbound/config.h > +++ b/usr.sbin/unbound/config.h > @@ -117,7 +117,7 @@ > > /* Define to 1 if you have the declaration of `evsignal_assign', and to 0 if > you don't. */ > -#define HAVE_DECL_EVSIGNAL_ASSIGN 1 > +/* #undef HAVE_DECL_EVSIGNAL_ASSIGN */ > > /* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you > don't. */ > The build tree I tested on universe14b was incorrect. After doing git subtree merge -P, I checked out a new branch (git checkout -b) and rebased it in order to test build with the latest pulled commit. Unfortunately since updating git rebase no longer rebases the subtree merge, instead placing the subtree's files in the root of the source tree. Because of this my test built an unmodified tree. Worse yet, I've been working on updating Heimdal (to 7.7.0 and now 7.8.0) but that branch can no longer rebase from main (while previously it would) due to excessive conflicts and files from crypto/heimdal ending up in the root of the src tree following git rebase main or even a git rebase -i (to squash some commits). I'm not sure if this is a new bug in git or a new feature -- i.e. fixing some brokenness in git subtree merge resulting in this new behaviour. Either way this has affected my workflow. -- Cheers, Cy Schubert <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org e^(i*pi)+1=0