pkgsrc-Changes archive

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

Re: CVS commit: pkgsrc/graphics/opencv



> Modified Files:
> pkgsrc/graphics/opencv: Makefile
> 
> Log Message:
> Fix location of pkgconfig file. Ensure that Python's cmake glue is
> active, during the refactoring to devel/cmake/build.mk it got broken.
> This fixes the build on systems with native Python installations.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.130 -r1.131 pkgsrc/graphics/opencv/Makefile
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 
> Modified files:
> 
> Index: pkgsrc/graphics/opencv/Makefile
> diff -u pkgsrc/graphics/opencv/Makefile:1.130 pkgsrc/graphics/opencv/Makefile:1.131
> --- pkgsrc/graphics/opencv/Makefile:1.130 Sun Apr  7 07:34:18 2024
> +++ pkgsrc/graphics/opencv/Makefile Thu Apr 11 11:45:46 2024
> @@ -1,4 +1,7 @@
> -# $NetBSD: Makefile,v 1.130 2024/04/07 07:34:18 wiz Exp $
> +# $NetBSD: Makefile,v 1.131 2024/04/11 11:45:46 joerg Exp $
> +
> +# Used by pyversion.mk
> +BUILD_USES_CMAKE= yes
> 
> PKGREVISION= 5
> .include "Makefile.common"
> @@ -12,8 +15,8 @@ INSTALLATION_DIRS+= share/doc/opencv/pap
> INSTALLATION_DIRS+= share/doc/opencv/ref/pics
> INSTALLATION_DIRS+= share/OpenCV/haarcascades
> 
> -PKGCONFIG_OVERRIDE+= build/unix-install/opencv.pc
> -PKGCONFIG_OVERRIDE_STAGE= post-configure
> +PKGCONFIG_OVERRIDE+= cmake-pkgsrc-build/unix-install/opencv.pc
> +PKGCONFIG_OVERRIDE_STAGE= post-build

I think this should be:

PKGCONFIG_OVERRIDE+= ${CMAKE_BUILD_DIR}/unix-install/opencv.pc


Home | Main Index | Thread Index | Old Index