Date: Thu, 6 Feb 2025 09:41:10 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: Kirill Ponomarev <krion@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 46124cf7ab6b - main - devel/pcre2: Add/rm forgotten patches Message-ID: <CAFDf7U%2BN-o4=fpV6OiDGP3sz-=1XcR-aU0SjA_Nd9R9t_kuYwg@mail.gmail.com> In-Reply-To: <202502060940.5169eLPK035793@gitrepo.freebsd.org> References: <202502060940.5169eLPK035793@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000677570062d760b16 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks! Kirill Ponomarev <krion@freebsd.org> escreveu (quinta, 6/02/2025 =C3=A0(s) 09:40): > The branch main has been updated by krion: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D46124cf7ab6bea21278475a4f9de8= d2763b66537 > > commit 46124cf7ab6bea21278475a4f9de8d2763b66537 > Author: Kirill Ponomarev <krion@FreeBSD.org> > AuthorDate: 2025-02-06 09:40:08 +0000 > Commit: Kirill Ponomarev <krion@FreeBSD.org> > CommitDate: 2025-02-06 09:40:08 +0000 > > devel/pcre2: Add/rm forgotten patches > --- > devel/pcre2/files/patch-Makefile.am | 11 > ----------- > .../files/patch-deps_sljit_sljit__src_sljitConfigInternal.h | 11 > +++++++++++ > devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h | 11 > ----------- > 3 files changed, 11 insertions(+), 22 deletions(-) > > diff --git a/devel/pcre2/files/patch-Makefile.am > b/devel/pcre2/files/patch-Makefile.am > deleted file mode 100644 > index 0aa4d5525f67..000000000000 > --- a/devel/pcre2/files/patch-Makefile.am > +++ /dev/null > @@ -1,11 +0,0 @@ > ---- Makefile.am.orig 2015-08-25 16:56:39 UTC > -+++ Makefile.am > -@@ -646,7 +646,7 @@ EXTRA_DIST +=3D src/pcre2demo.c > - > - # We have .pc files for pkg-config users. > - > --pkgconfigdir =3D $(libdir)/pkgconfig > -+pkgconfigdir =3D $(libdir)data/pkgconfig > - pkgconfig_DATA =3D > - > - if WITH_PCRE2_8 > diff --git > a/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h > b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h > new file mode 100644 > index 000000000000..67ebc2b80ddc > --- /dev/null > +++ b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h > @@ -0,0 +1,11 @@ > +--- deps/sljit/sljit_src/sljitConfigInternal.h.orig 2025-02-06 > 07:15:34 UTC > ++++ deps/sljit/sljit_src/sljitConfigInternal.h > +@@ -255,7 +255,7 @@ extern "C" { > + * system provided method that should be defined below is used > + * instead. > + */ > +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) > ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined > SLJIT_CONFIG_PPC_32) > + #if __has_builtin(__builtin___clear_cache) && !defined(__clang__) > + > + /* > diff --git a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h > b/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h > deleted file mode 100644 > index 7d14d71c3d86..000000000000 > --- a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h > +++ /dev/null > @@ -1,11 +0,0 @@ > ---- src/sljit/sljitConfigInternal.h.orig 2022-05-02 15:22:09 UTC > -+++ src/sljit/sljitConfigInternal.h > -@@ -333,7 +333,7 @@ extern "C" { > - * beware APPLE is known to have removed the code in iOS so > - * it will need to be excempted or result in broken builds > - */ > --#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin) > -+#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin && !defined > SLJIT_CONFIG_PPC_32) > - #if __has_builtin(__builtin___clear_cache) && !defined(__clang__) > - > - /* > --=20 Nuno Teixeira FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org --000000000000677570062d760b16 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr">Thanks!</div><br><div class=3D"gmail_quote gmail_quote_con= tainer"><div dir=3D"ltr" class=3D"gmail_attr">Kirill Ponomarev <<a href= =3D"mailto:krion@freebsd.org">krion@freebsd.org</a>> escreveu (quinta, 6= /02/2025 =C3=A0(s) 09:40):<br></div><blockquote class=3D"gmail_quote" style= =3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding= -left:1ex">The branch main has been updated by krion:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D46124cf7ab6bea2= 1278475a4f9de8d2763b66537" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D46124cf7ab6bea21278475a4f9de8d2763b66537</= a><br> <br> commit 46124cf7ab6bea21278475a4f9de8d2763b66537<br> Author:=C2=A0 =C2=A0 =C2=A0Kirill Ponomarev <krion@FreeBSD.org><br> AuthorDate: 2025-02-06 09:40:08 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Kirill Ponomarev <krion@FreeBSD.org><br> CommitDate: 2025-02-06 09:40:08 +0000<br> <br> =C2=A0 =C2=A0 devel/pcre2: Add/rm forgotten patches<br> ---<br> =C2=A0devel/pcre2/files/patch-Makefile.am=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 11 -------= ----<br> =C2=A0.../files/patch-deps_sljit_sljit__src_sljitConfigInternal.h=C2=A0 =C2= =A0| 11 +++++++++++<br> =C2=A0devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h=C2=A0 =C2=A0 = =C2=A0 =C2=A0| 11 -----------<br> =C2=A03 files changed, 11 insertions(+), 22 deletions(-)<br> <br> diff --git a/devel/pcre2/files/patch-Makefile.am b/devel/pcre2/files/patch-= Makefile.am<br> deleted file mode 100644<br> index 0aa4d5525f67..000000000000<br> --- a/devel/pcre2/files/patch-Makefile.am<br> +++ /dev/null<br> @@ -1,11 +0,0 @@<br> ---- Makefile.am.orig=C2=A0 =C2=A02015-08-25 16:56:39 UTC<br> -+++ Makefile.am<br> -@@ -646,7 +646,7 @@ EXTRA_DIST +=3D src/pcre2demo.c<br> - <br> - # We have .pc files for pkg-config users.<br> - <br> --pkgconfigdir =3D $(libdir)/pkgconfig<br> -+pkgconfigdir =3D $(libdir)data/pkgconfig<br> - pkgconfig_DATA =3D<br> - <br> - if WITH_PCRE2_8<br> diff --git a/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInter= nal.h b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h= <br> new file mode 100644<br> index 000000000000..67ebc2b80ddc<br> --- /dev/null<br> +++ b/devel/pcre2/files/patch-deps_sljit_sljit__src_sljitConfigInternal.h<b= r> @@ -0,0 +1,11 @@<br> +--- deps/sljit/sljit_src/sljitConfigInternal.h.orig=C2=A0 =C2=A0 2025-02-0= 6 07:15:34 UTC<br> ++++ deps/sljit/sljit_src/sljitConfigInternal.h<br> +@@ -255,7 +255,7 @@ extern "C" {<br> +=C2=A0 * system provided method that should be defined below is used<br> +=C2=A0 * instead.<br> +=C2=A0 */<br> +-#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin)<br> ++#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin &&am= p; !defined SLJIT_CONFIG_PPC_32)<br> + #if __has_builtin(__builtin___clear_cache) && !defined(__clang__)= <br> + <br> + /*<br> diff --git a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h b/deve= l/pcre2/files/patch-src_sljit_sljitConfigInternal.h<br> deleted file mode 100644<br> index 7d14d71c3d86..000000000000<br> --- a/devel/pcre2/files/patch-src_sljit_sljitConfigInternal.h<br> +++ /dev/null<br> @@ -1,11 +0,0 @@<br> ---- src/sljit/sljitConfigInternal.h.orig=C2=A0 =C2=A0 =C2=A0 =C2=A02022-05= -02 15:22:09 UTC<br> -+++ src/sljit/sljitConfigInternal.h<br> -@@ -333,7 +333,7 @@ extern "C" {<br> -=C2=A0 * beware APPLE is known to have removed the code in iOS so<br> -=C2=A0 * it will need to be excempted or result in broken builds<br> -=C2=A0 */<br> --#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin)<br> -+#if (!defined SLJIT_CACHE_FLUSH && defined __has_builtin &&am= p; !defined SLJIT_CONFIG_PPC_32)<br> - #if __has_builtin(__builtin___clear_cache) && !defined(__clang__)= <br> - <br> - /*<br> </blockquote></div><div><br clear=3D"all"></div><br><span class=3D"gmail_si= gnature_prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><d= iv dir=3D"ltr"><div><font color=3D"#888888">Nuno Teixeira</font></div><div>= <div><font color=3D"#888888"> FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 <a h= ref=3D"https://FreeBSD.org" rel=3D"noreferrer" target=3D"_blank">https://Fr= eeBSD.org</a><br></font></div></div></div></div> --000000000000677570062d760b16--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7U%2BN-o4=fpV6OiDGP3sz-=1XcR-aU0SjA_Nd9R9t_kuYwg>