tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: devel/ocaml-findlib DESTDIR fix



hiramatsu%jgoamakf.info@localhost writes:

> I think devel/ocaml-findlib/buildlink3.mk does not work as expected,
> because it can not install target files into DESTDIR.
>
> Can I commit this patch?
>
> Index: buildlink3.mk
> ===================================================================
> RCS file: /cvsroot/pkgsrc/devel/ocaml-findlib/buildlink3.mk,v
> retrieving revision 1.4
> diff -b -u -r1.4 buildlink3.mk
> --- buildlink3.mk     6 Jul 2012 09:22:04 -0000       1.4
> +++ buildlink3.mk     9 Apr 2014 08:41:09 -0000
> @@ -15,6 +15,7 @@
>  ocaml-findlib-wrappers:
>       ${RUN}                                                          \
>       ${SED}  -e 's|@SH@|'${SH:Q}'|g'                                 \
> +             -e 's|@DESTDIR@|${DESTDIR}|g'                           \
>               -e 
> 's|@OCAML_FINDLIB_PREFIX@|${BUILDLINK_PREFIX.ocaml-findlib}|g' \
>               -e 's|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g'               \
>               < ${.CURDIR}/../../devel/ocaml-findlib/files/ocamlfind.sh \
> Index: files/ocamlfind.sh
> ===================================================================
> RCS file: /cvsroot/pkgsrc/devel/ocaml-findlib/files/ocamlfind.sh,v
> retrieving revision 1.1
> diff -b -u -r1.1 ocamlfind.sh
> --- files/ocamlfind.sh        15 Jun 2011 05:25:47 -0000      1.1
> +++ files/ocamlfind.sh        9 Apr 2014 08:41:09 -0000
> @@ -9,7 +9,7 @@
>       case "$args" in
>       *-destdir*) ;;
>       *)
> -             install_args="${install_args} -destdir 
> ${DESTDIR}@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib"
> +             install_args="${install_args} -destdir 
> @DESTDIR@@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib"
>               ;;
>       esac
>       case "$args" in

I'm not MAINTAINER, so you should give jaapb@ a few more days.  But I am
curious if you have found that the patch fixes the build of depending
packages.
(It certainly seems like the patch is right, but you didn't say that you
actually tested it!)

Attachment: pgpFbZUXlWRq_.pgp
Description: PGP signature



Home | Main Index | Thread Index | Old Index