* [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
@ 2013-11-27 10:40 Nick D'Ademo
2013-11-27 13:43 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Nick D'Ademo @ 2013-11-27 10:40 UTC (permalink / raw)
To: openembedded-devel
Pass LIB_SUFFIX to CMake during a multilib build so that the generated library folder has the correct suffix.
Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 9dd9cd0..8d4d8da 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET = "arm"
DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
-SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
+SRCREV = "1253c2101b22b9e89400553fd220858cda8d6ea5"
SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
file://opencv-fix-pkgconfig-generation.patch \
"
@@ -27,6 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
-DWITH_GSTREAMER=OFF \
-DCMAKE_SKIP_RPATH=ON \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
+ ${@bb.utils.contains("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@bb.utils.contains("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
@@ -88,4 +90,10 @@ RDEPENDS_python-opencv = "python-core python-numpy"
do_install_append() {
cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
+
+ # Move Python files into correct library folder (for multilib build)
+ if [ "$libdir" != "/usr/lib" ]; then
+ mv ${D}/usr/lib/* ${D}/${libdir}/
+ rm -rf ${D}/usr/lib
+ fi
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
2013-11-27 10:40 [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible Nick D'Ademo
@ 2013-11-27 13:43 ` Martin Jansa
2013-11-28 1:58 ` Nick D'Ademo
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2013-11-27 13:43 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 2377 bytes --]
On Wed, Nov 27, 2013 at 09:40:30PM +1100, Nick D'Ademo wrote:
> Pass LIB_SUFFIX to CMake during a multilib build so that the generated library folder has the correct suffix.
>
> Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
> ---
> meta-oe/recipes-support/opencv/opencv_2.4.bb | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> index 9dd9cd0..8d4d8da 100644
> --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> @@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET = "arm"
>
> DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
>
> -SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
> +SRCREV = "1253c2101b22b9e89400553fd220858cda8d6ea5"
> SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
> file://opencv-fix-pkgconfig-generation.patch \
> "
> @@ -27,6 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
> -DWITH_GSTREAMER=OFF \
> -DCMAKE_SKIP_RPATH=ON \
> ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
> + ${@bb.utils.contains("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
> + ${@bb.utils.contains("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
do you need contains here? Why not base_conditional?
> "
>
> PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
> @@ -88,4 +90,10 @@ RDEPENDS_python-opencv = "python-core python-numpy"
> do_install_append() {
> cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
> sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
> +
> + # Move Python files into correct library folder (for multilib build)
> + if [ "$libdir" != "/usr/lib" ]; then
> + mv ${D}/usr/lib/* ${D}/${libdir}/
> + rm -rf ${D}/usr/lib
> + fi
> }
> --
> 1.7.9.5
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
2013-11-27 13:43 ` Martin Jansa
@ 2013-11-28 1:58 ` Nick D'Ademo
0 siblings, 0 replies; 6+ messages in thread
From: Nick D'Ademo @ 2013-11-28 1:58 UTC (permalink / raw)
To: openembedded-devel
You're quite right Martin - "base_conditional" makes more sense here. I'll
resend the updated patch now.
Cheers,
Nick
On Thu, Nov 28, 2013 at 12:43 AM, Martin Jansa <martin.jansa@gmail.com>wrote:
> On Wed, Nov 27, 2013 at 09:40:30PM +1100, Nick D'Ademo wrote:
> > Pass LIB_SUFFIX to CMake during a multilib build so that the generated
> library folder has the correct suffix.
> >
> > Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
> > ---
> > meta-oe/recipes-support/opencv/opencv_2.4.bb | 10 +++++++++-
> > 1 file changed, 9 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bbb/meta-oe/recipes-support/opencv/
> opencv_2.4.bb
> > index 9dd9cd0..8d4d8da 100644
> > --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
> > +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> > @@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET = "arm"
> >
> > DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib
> glib-2.0"
> >
> > -SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
> > +SRCREV = "1253c2101b22b9e89400553fd220858cda8d6ea5"
> > SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
> > file://opencv-fix-pkgconfig-generation.patch \
> > "
> > @@ -27,6 +27,8 @@ EXTRA_OECMAKE =
> "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
> > -DWITH_GSTREAMER=OFF \
> > -DCMAKE_SKIP_RPATH=ON \
> > ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3",
> "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
> > + ${@bb.utils.contains("libdir", "/usr/lib64",
> "-DLIB_SUFFIX=64", "", d)} \
> > + ${@bb.utils.contains("libdir", "/usr/lib32",
> "-DLIB_SUFFIX=32", "", d)} \
>
> do you need contains here? Why not base_conditional?
> > "
> >
> > PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
> > @@ -88,4 +90,10 @@ RDEPENDS_python-opencv = "python-core python-numpy"
> > do_install_append() {
> > cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
> > sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
> > +
> > + # Move Python files into correct library folder (for multilib build)
> > + if [ "$libdir" != "/usr/lib" ]; then
> > + mv ${D}/usr/lib/* ${D}/${libdir}/
> > + rm -rf ${D}/usr/lib
> > + fi
> > }
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
@ 2013-11-28 2:23 Nick D'Ademo
0 siblings, 0 replies; 6+ messages in thread
From: Nick D'Ademo @ 2013-11-28 2:23 UTC (permalink / raw)
To: openembedded-devel
Pass LIB_SUFFIX to CMake during a multilib build so that the generated library folder has the correct suffix.
Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 8d4d8da..df89b0a 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -27,8 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
-DWITH_GSTREAMER=OFF \
-DCMAKE_SKIP_RPATH=ON \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
- ${@bb.utils.contains("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
- ${@bb.utils.contains("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
@ 2013-11-28 2:38 Nick D'Ademo
2013-11-28 2:40 ` Nick D'Ademo
0 siblings, 1 reply; 6+ messages in thread
From: Nick D'Ademo @ 2013-11-28 2:38 UTC (permalink / raw)
To: openembedded-devel
Pass LIB_SUFFIX to CMake during a multilib build so that the generated library folder has the correct suffix.
Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index 9dd9cd0..df89b0a 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET = "arm"
DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0"
-SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
+SRCREV = "1253c2101b22b9e89400553fd220858cda8d6ea5"
SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
file://opencv-fix-pkgconfig-generation.patch \
"
@@ -27,6 +27,8 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
-DWITH_GSTREAMER=OFF \
-DCMAKE_SKIP_RPATH=ON \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
+ ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \
"
PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
@@ -88,4 +90,10 @@ RDEPENDS_python-opencv = "python-core python-numpy"
do_install_append() {
cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
+
+ # Move Python files into correct library folder (for multilib build)
+ if [ "$libdir" != "/usr/lib" ]; then
+ mv ${D}/usr/lib/* ${D}/${libdir}/
+ rm -rf ${D}/usr/lib
+ fi
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible
2013-11-28 2:38 Nick D'Ademo
@ 2013-11-28 2:40 ` Nick D'Ademo
0 siblings, 0 replies; 6+ messages in thread
From: Nick D'Ademo @ 2013-11-28 2:40 UTC (permalink / raw)
To: openembedded-devel
Previous message contains complete final patch.
Cheers,
Nick
On Thu, Nov 28, 2013 at 1:38 PM, Nick D'Ademo <nickdademo@gmail.com> wrote:
> Pass LIB_SUFFIX to CMake during a multilib build so that the generated
> library folder has the correct suffix.
>
> Signed-off-by: Nick D'Ademo <nickdademo@gmail.com>
> ---
> meta-oe/recipes-support/opencv/opencv_2.4.bb | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bbb/meta-oe/recipes-support/opencv/
> opencv_2.4.bb
> index 9dd9cd0..df89b0a 100644
> --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
> +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
> @@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET = "arm"
>
> DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib
> glib-2.0"
>
> -SRCREV = "c5afaa4e8dfe507e87531f7688b9cf65c1f701c6"
> +SRCREV = "1253c2101b22b9e89400553fd220858cda8d6ea5"
> SRC_URI = "git://github.com/Itseez/opencv.git;branch=2.4 \
> file://opencv-fix-pkgconfig-generation.patch \
> "
> @@ -27,6 +27,8 @@ EXTRA_OECMAKE =
> "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}
> -DWITH_GSTREAMER=OFF \
> -DCMAKE_SKIP_RPATH=ON \
> ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3",
> "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
> + ${@base_conditional("libdir", "/usr/lib64",
> "-DLIB_SUFFIX=64", "", d)} \
> + ${@base_conditional("libdir", "/usr/lib32",
> "-DLIB_SUFFIX=32", "", d)} \
> "
>
> PACKAGECONFIG ??= "eigen gtk jpeg libav png tiff v4l"
> @@ -88,4 +90,10 @@ RDEPENDS_python-opencv = "python-core python-numpy"
> do_install_append() {
> cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/
> sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h
> +
> + # Move Python files into correct library folder (for multilib build)
> + if [ "$libdir" != "/usr/lib" ]; then
> + mv ${D}/usr/lib/* ${D}/${libdir}/
> + rm -rf ${D}/usr/lib
> + fi
> }
> --
> 1.7.9.5
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-28 2:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-27 10:40 [meta-oe][PATCH] opencv: bump SRCREV and make recipe multilib build compatible Nick D'Ademo
2013-11-27 13:43 ` Martin Jansa
2013-11-28 1:58 ` Nick D'Ademo
-- strict thread matches above, loose matches on Subject: below --
2013-11-28 2:23 Nick D'Ademo
2013-11-28 2:38 Nick D'Ademo
2013-11-28 2:40 ` Nick D'Ademo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.