that's ok with me.
On 2023/12/01 14:11, Theo Buehler wrote:
> On Fri, Dec 01, 2023 at 12:34:23PM +0000, Stuart Henderson wrote:
> > On 2023/12/01 13:32, Antoine Jacoutot wrote:
> > > On Tue, Nov 28, 2023 at 06:03:34PM -0700, Greg Steuck wrote:
> > > > CVSROOT: /cvs
> > > > Module name: ports
> > > > Changes by: gne...@cvs.openbsd.org 2023/11/28 18:03:34
> > > >
> > > > Modified files:
> > > > devel/bazel : Makefile
> > > > devel/bazel/patches: patch-distdir_deps_bzl
> > > > Added files:
> > > > devel/bazel/patches/abseil:
> > > >
> > > > patch-absl_base_internal_raw_logging_cc
> > > >
> > > > patch-absl_base_internal_unscaledcycleclock_config_h
> > > > patch-absl_status_status_cc
> > > >
> > > > Log message:
> > > > Copy relevant patches from devel/abseil to devel/bazel
> > > >
> > > > ok tb@
> > > >
> > >
> > > cp /exopi-cvs/ports/distfiles/abseil-abseil-cpp-20230802.1.tar.gz
> > > /exopi-obj/pobj/bazel-6.3.2/bazel-6.3.2/derived/distdir/20230802.1.tar.gz
> > > mkdir /exopi-obj/pobj/bazel-6.3.2/bazel-6.3.2/third_party/abseil
> > > cp /exopi-cvs/ports/devel/bazel/patches/abseil/*
> > > /exopi-obj/pobj/bazel-6.3.2/bazel-6.3.2/third_party/abseil
> > > cp: /exopi-cvs/ports/devel/bazel/patches/abseil/CVS is a directory (not
> > > copied).
> >
> > I don't think that using a subdirectory of patches is a good place
> > for these files either.
> >
>
> I didn't look closely enough... How about moving the patches to files/
> and doing this instead?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/bazel/Makefile,v
> diff -u -p -r1.4 Makefile
> --- Makefile 29 Nov 2023 01:04:40 -0000 1.4
> +++ Makefile 1 Dec 2023 13:01:42 -0000
> @@ -44,7 +44,7 @@ post-patch:
> cp ${FULLDISTDIR}/abseil-abseil-cpp-${ABSEIL_VER}.tar.gz \
> ${WRKSRC}/derived/distdir/${ABSEIL_VER}.tar.gz
> mkdir ${WRKSRC}/third_party/abseil
> - cp ${PATCHDIR}/abseil/* ${WRKSRC}/third_party/abseil
> + cp ${FILESDIR}/patch-* ${WRKSRC}/third_party/abseil
>
> do-build:
> cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
>
