Date: Sat, 3 Feb 2018 03:52:52 +0800 From: Sunpoet Po-Chuan Hsieh <sunpoet@freebsd.org> To: Mark Felder <feld@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r460648 - in head/security/snort3: . files Message-ID: <CAMHz58SQXkqW8CTuy0U5KtHFQyHhdka7odFD-BHHqjjQiSh=jA@mail.gmail.com> In-Reply-To: <201802012252.w11MqUdq031037@repo.freebsd.org> References: <201802012252.w11MqUdq031037@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Feb 2, 2018 at 6:52 AM, Mark Felder <feld@freebsd.org> wrote: > Author: feld > Date: Thu Feb 1 22:52:29 2018 > New Revision: 460648 > URL: https://svnweb.freebsd.org/changeset/ports/460648 > > Log: > security/snort3: Fix build with FreeBSD 10.3 > > Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210890 > > MFH: 2018Q1 > > Added: > head/security/snort3/files/ > head/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h > (contents, props changed) > Modified: > head/security/snort3/Makefile > > Modified: head/security/snort3/Makefile > ============================================================ > ================== > --- head/security/snort3/Makefile Thu Feb 1 22:30:58 2018 > (r460647) > +++ head/security/snort3/Makefile Thu Feb 1 22:52:29 2018 > (r460648) > @@ -40,6 +40,12 @@ DEBUG_CONFIGURE_DISABLE= corefiles > DEBUG_MAKE_ENV= DONTSTRIP="yes" > LRGPCAP_CONFIGURE_ENABLE= large-pcap > > +.include <bsd.port.pre.mk> > + > +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1004000 > +EXTRA_PATCHES= ${PATCHDIR}/freebsd103_patch-s > rc_memory_memory__allocator.h > +.endif > + > .include <bsd.port.options.mk> > Hi, The .include line can be removed now. > GNU_CONFIGURE= yes > @@ -49,4 +55,4 @@ CFLAGS+= -I${LOCALBASE}/include > > CONFLICTS= snort-2* > > -.include <bsd.port.mk> > +.include <bsd.port.post.mk> > > Added: head/security/snort3/files/freebsd103_patch-src_memory_memor > y__allocator.h > ============================================================ > ================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/security/snort3/files/freebsd103_patch-src_memory_memory__allocator.h > Thu Feb 1 22:52:29 2018 (r460648) > @@ -0,0 +1,14 @@ > +--- src/memory/memory_allocator.h.orig 2018-02-01 22:21:37 UTC > ++++ src/memory/memory_allocator.h > +@@ -34,4 +34,11 @@ struct MemoryAllocator > + > + } // namespace memory > + > ++// Fix for FreeBSD 10.3's broken toolchain > ++typedef struct { > ++ long long __max_align1 __aligned(_Alignof(long long)); > ++ long double __max_align2 __aligned(_Alignof(long double)); > ++} max_align_t; > ++ > ++ > + #endif > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SQXkqW8CTuy0U5KtHFQyHhdka7odFD-BHHqjjQiSh=jA>