| Message ID | 1390073027-14239-5-git-send-email-s.martin49@gmail.com |
|---|---|
| State | Accepted |
| Commit | 9fa7f2b113927ee0c53f137948deb2dadfa3cc4d |
| Headers | show |
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes: > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/pkg-cmake.mk | 1 + > 1 file changed, 1 insertion(+) > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 463cd63..aedd1fc 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -64,6 +64,7 @@ define $(2)_CONFIGURE_CMDS > $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ I don't know much about cmake, but what exact problem does this fix and with how many packages did you test this? > $$($$(PKG)_CONF_OPT) \ > ) > endef > -- > 1.8.5.3 > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Smauel, All, On 2014-01-18 20:23 +0100, Samuel Martin spake thusly: > Signed-off-by: Samuel Martin <s.martin49@gmail.com> > --- > package/pkg-cmake.mk | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk > index 463cd63..aedd1fc 100644 > --- a/package/pkg-cmake.mk > +++ b/package/pkg-cmake.mk > @@ -64,6 +64,7 @@ define $(2)_CONFIGURE_CMDS > $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ > -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ > -DCMAKE_INSTALL_PREFIX="/usr" \ > + -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ > $$($$(PKG)_CONF_OPT) \ > ) > endef This change breaks the rpi-userland build. It is not obvious that the build is broken, since the rpi-userland package itself still seems to build fine, but packages that use it (eg. omxplayer that I'm integrating) now fail to build. To reproduce (recipe untested, may need some tweaking, adjust accordingly): git checkout master git pull git@gitorious.org:buildroot/buildroot.git yem/omxplayer make menuconfig -> arm, arm1176jzf-s, EABIhf, vfpv2 -> Target packages -> Audio and video applications -> omxplayer make # Coffee/tea/beer/... # watch it fail make clean git revert 9fa7f2b # pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB make # Coffee/tea/beer/... # It builds. Yeah! Thanks to Maxime for finding the culprit! Regards, Yann E. MORIN.
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 463cd63..aedd1fc 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -64,6 +64,7 @@ define $(2)_CONFIGURE_CMDS $$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \ -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ -DCMAKE_INSTALL_PREFIX="/usr" \ + -DBUILD_SHARED_LIBS=$(if $(BR2_PREFER_STATIC_LIB),OFF,ON) \ $$($$(PKG)_CONF_OPT) \ ) endef
Signed-off-by: Samuel Martin <s.martin49@gmail.com> --- package/pkg-cmake.mk | 1 + 1 file changed, 1 insertion(+)