* [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 19:49 ` Yann E. MORIN
2014-01-19 20:16 ` Peter Korsgaard
2014-01-18 19:23 ` [Buildroot] [PATCH 02/10] transmission: add url in Config.in Samuel Martin
` (8 subsequent siblings)
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
As said in its help text, eigen heavily uses C++ features.
So, explicit this dependency in the Config.in.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
changes v1 -> v2:
- add Reviewed-by tag
---
package/eigen/Config.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/eigen/Config.in b/package/eigen/Config.in
index c7fcde2..e94f9a3 100644
--- a/package/eigen/Config.in
+++ b/package/eigen/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_EIGEN
bool "eigen"
+ depends on BR2_INSTALL_LIBSTDCPP
help
Eigen is a C++ template library for linear algebra: vectors,
matrices, and related algorithms. It is versatile, fast, elegant
@@ -11,3 +12,6 @@ config BR2_PACKAGE_EIGEN
template library defined in the headers.
http://eigen.tuxfamily.org/
+
+comment "eigen needs a toolchain w/ C++"
+ depends on !BR2_INSTALL_LIBSTDCPP
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency
2014-01-18 19:23 ` [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency Samuel Martin
@ 2014-01-18 19:49 ` Yann E. MORIN
2014-01-19 20:16 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 19:49 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> As said in its help text, eigen heavily uses C++ features.
> So, explicit this dependency in the Config.in.
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> changes v1 -> v2:
> - add Reviewed-by tag
> ---
> package/eigen/Config.in | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/package/eigen/Config.in b/package/eigen/Config.in
> index c7fcde2..e94f9a3 100644
> --- a/package/eigen/Config.in
> +++ b/package/eigen/Config.in
> @@ -1,5 +1,6 @@
> config BR2_PACKAGE_EIGEN
> bool "eigen"
> + depends on BR2_INSTALL_LIBSTDCPP
> help
> Eigen is a C++ template library for linear algebra: vectors,
> matrices, and related algorithms. It is versatile, fast, elegant
> @@ -11,3 +12,6 @@ config BR2_PACKAGE_EIGEN
> template library defined in the headers.
>
> http://eigen.tuxfamily.org/
> +
> +comment "eigen needs a toolchain w/ C++"
> + depends on !BR2_INSTALL_LIBSTDCPP
> --
> 1.8.5.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency
2014-01-18 19:23 ` [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency Samuel Martin
2014-01-18 19:49 ` Yann E. MORIN
@ 2014-01-19 20:16 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:16 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
> As said in its help text, eigen heavily uses C++ features.
> So, explicit this dependency in the Config.in.
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> changes v1 -> v2:
> - add Reviewed-by tag
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 02/10] transmission: add url in Config.in
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 19:50 ` Yann E. MORIN
2014-01-19 20:16 ` Peter Korsgaard
2014-01-18 19:23 ` [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook Samuel Martin
` (7 subsequent siblings)
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/transmission/Config.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 8d413c6..596b0ed 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -10,6 +10,8 @@ config BR2_PACKAGE_TRANSMISSION
help
Transmission is a cross-platform BitTorrent client.
+ https://trac.transmissionbt.com/
+
if BR2_PACKAGE_TRANSMISSION
config BR2_PACKAGE_TRANSMISSION_UTP
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 02/10] transmission: add url in Config.in
2014-01-18 19:23 ` [Buildroot] [PATCH 02/10] transmission: add url in Config.in Samuel Martin
@ 2014-01-18 19:50 ` Yann E. MORIN
2014-01-19 20:16 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 19:50 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> package/transmission/Config.in | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/package/transmission/Config.in b/package/transmission/Config.in
> index 8d413c6..596b0ed 100644
> --- a/package/transmission/Config.in
> +++ b/package/transmission/Config.in
> @@ -10,6 +10,8 @@ config BR2_PACKAGE_TRANSMISSION
> help
> Transmission is a cross-platform BitTorrent client.
>
> + https://trac.transmissionbt.com/
This link yields an error page:
---8<---
Trac Error
TracError: No Trac environment found@/trac/Transmission
[Errno 24] Too many open files: '/trac/Transmission/VERSION'
---8<---
OTOH, http://www.transmissionbt.com/ works as expected.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 02/10] transmission: add url in Config.in
2014-01-18 19:23 ` [Buildroot] [PATCH 02/10] transmission: add url in Config.in Samuel Martin
2014-01-18 19:50 ` Yann E. MORIN
@ 2014-01-19 20:16 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:16 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> package/transmission/Config.in | 2 ++
> 1 file changed, 2 insertions(+)
> diff --git a/package/transmission/Config.in b/package/transmission/Config.in
> index 8d413c6..596b0ed 100644
> --- a/package/transmission/Config.in
> +++ b/package/transmission/Config.in
> @@ -10,6 +10,8 @@ config BR2_PACKAGE_TRANSMISSION
> help
> Transmission is a cross-platform BitTorrent client.
> + https://trac.transmissionbt.com/
Committed with the URL changed to the homepage as pointed out by Yann,
thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 01/10] eigen: add C++ toolchain dependency Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 02/10] transmission: add url in Config.in Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 19:52 ` Yann E. MORIN
2014-01-19 20:19 ` Peter Korsgaard
2014-01-18 19:23 ` [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB Samuel Martin
` (6 subsequent siblings)
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/transmission/transmission.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 3ced558..e52c7be 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -19,7 +19,7 @@ TRANSMISSION_CONF_OPT = \
--disable-libnotify \
--enable-lightweight
-define TRANSMISSION_INIT_SCRIPT_INSTALL
+define TRANSMISSION_INSTALL_INIT_SYSV
[ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \
$(INSTALL) -m 0755 -D package/transmission/S92transmission \
$(TARGET_DIR)/etc/init.d/S92transmission
@@ -39,7 +39,6 @@ endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
TRANSMISSION_CONF_OPT += --enable-daemon
- TRANSMISSION_POST_INSTALL_TARGET_HOOKS += TRANSMISSION_INIT_SCRIPT_INSTALL
else
TRANSMISSION_CONF_OPT += --disable-daemon
endif
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook
2014-01-18 19:23 ` [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook Samuel Martin
@ 2014-01-18 19:52 ` Yann E. MORIN
2014-01-19 20:19 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 19:52 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook
2014-01-18 19:23 ` [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook Samuel Martin
2014-01-18 19:52 ` Yann E. MORIN
@ 2014-01-19 20:19 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:19 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> package/transmission/transmission.mk | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
> diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
> index 3ced558..e52c7be 100644
> --- a/package/transmission/transmission.mk
> +++ b/package/transmission/transmission.mk
> @@ -19,7 +19,7 @@ TRANSMISSION_CONF_OPT = \
> --disable-libnotify \
> --enable-lightweight
> -define TRANSMISSION_INIT_SCRIPT_INSTALL
> +define TRANSMISSION_INSTALL_INIT_SYSV
> [ -f $(TARGET_DIR)/etc/init.d/S92transmission ] || \
> $(INSTALL) -m 0755 -D package/transmission/S92transmission \
> $(TARGET_DIR)/etc/init.d/S92transmission
> @@ -39,7 +39,6 @@ endif
> ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
> TRANSMISSION_CONF_OPT += --enable-daemon
> - TRANSMISSION_POST_INSTALL_TARGET_HOOKS += TRANSMISSION_INIT_SCRIPT_INSTALL
With this change we're installing the init script even if _DAEMON isn't
enabled, so I've fixed it by moving TRANSMISSION_INSTALL_INIT_SYSV here.
Committed with that change, thanks.
> else
> TRANSMISSION_CONF_OPT += --disable-daemon
> endif
> --
> 1.8.5.3
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (2 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 03/10] transmission: use <PKG>_INSTALL_INIT_SYSV infra instead of custom hook Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-19 20:28 ` Peter Korsgaard
2014-01-24 0:08 ` Yann E. MORIN
2014-01-18 19:23 ` [Buildroot] [PATCH 05/10] qt: add an option to install the test module Samuel Martin
` (5 subsequent siblings)
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
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
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB
2014-01-18 19:23 ` [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB Samuel Martin
@ 2014-01-19 20:28 ` Peter Korsgaard
2014-01-24 0:08 ` Yann E. MORIN
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:28 UTC (permalink / raw)
To: buildroot
>>>>> "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 at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB
2014-01-18 19:23 ` [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB Samuel Martin
2014-01-19 20:28 ` Peter Korsgaard
@ 2014-01-24 0:08 ` Yann E. MORIN
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-24 0:08 UTC (permalink / raw)
To: 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 at 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.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 05/10] qt: add an option to install the test module
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (3 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 04/10] pkg-cmake.mk: build shared library when !BR2_PREFER_STATIC_LIB Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-02-11 20:06 ` Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 06/10] opencv: fix qt selection when highgui is enable Samuel Martin
` (4 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
When building Qt in a minimal configuration, a couple of Qt modules
(QtNetwork, QtSql, QtTest and QtXml) are built in addition to QtCore,
so they are installed in the sysroot but they are not copied into the
target tree.
Among these modules that could be built but optionally installed, only
QtTest had no option to allow being installed in the target fs.
Thus, programs linking against QtTest would successfully build, but
would miserably fail at runtime due to this missing dependency.
So far, the only package triggering this issue is OpenCV (the highgui
module built with Qt support).
A followup patch will add this missing dependency in OpenCV using this
new option.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/qt/Config.in | 7 +++++++
package/qt/qt.mk | 3 +++
2 files changed, 10 insertions(+)
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 926d54c..bd6496c 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -413,4 +413,11 @@ config BR2_PACKAGE_QT_DECLARATIVE
Build the Qt Declarative Module for qml support
if unsure, say n.
+config BR2_PACKAGE_QT_TEST
+ bool "Test Module"
+ default y
+ help
+ Install the Test module.
+ if unsure, say y
+
endif # BR2_PACKAGE_QT
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 867b798..b63fa6f 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -586,6 +586,9 @@ endif
ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
QT_INSTALL_LIBS += pvrQWSWSEGL
endif
+ifeq ($(BR2_PACKAGE_QT_TEST),y)
+QT_INSTALL_LIBS += QtTest
+endif
QT_CONF_FILE=$(HOST_DIR)/usr/bin/qt.conf
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 06/10] opencv: fix qt selection when highgui is enable
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (4 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 05/10] qt: add an option to install the test module Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-02-11 20:07 ` Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 07/10] connman: add systemd unit file Samuel Martin
` (3 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
The OpenCV highgui module links against QtGui and QtTest.
The latter is built by default but was never installed.
Thanks to the previous patch on Qt, this can be rectified.
So, update the OpenCV Config.in with the missing Qt module selection.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/opencv/Config.in | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index 146011a..79c7b0b 100644
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -174,9 +174,11 @@ config BR2_PACKAGE_OPENCV_WITH_QT
depends on !BR2_avr32 # qt
select BR2_PACKAGE_QT
select BR2_PACKAGE_QT_STL
+ select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_OPENCV_LIB_HIGHGUI
+ select BR2_PACKAGE_QT_TEST if BR2_PACKAGE_OPENCV_LIB_HIGHGUI
default y
help
- Use Qt with STL support
+ Use Qt with QtTest module and STL support
config BR2_PACKAGE_OPENCV_WITH_TIFF
bool "tiff support"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/10] connman: add systemd unit file
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (5 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 06/10] opencv: fix qt selection when highgui is enable Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 19:56 ` Yann E. MORIN
2014-01-18 22:19 ` Lucas De Marchi
2014-01-18 19:23 ` [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system Samuel Martin
` (2 subsequent siblings)
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
This patch cleans up the init material installation:
- it uses the *_INSTALL_INIT_SYSV infra instead of the custom hook;
- it add and install the systemd unit file
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/connman/connman.mk | 10 ++++++++--
package/connman/connman.service | 12 ++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 package/connman/connman.service
diff --git a/package/connman/connman.mk b/package/connman/connman.mk
index 64c1f0e..9161cce 100644
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@@ -24,11 +24,17 @@ CONNMAN_DEPENDENCIES += \
$(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
$(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono)
-define CONNMAN_INSTALL_INITSCRIPT
+define CONNMAN_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
endef
-CONNMAN_POST_INSTALL_TARGET_HOOKS = CONNMAN_INSTALL_INITSCRIPT
+define CONNMAN_INSTALL_INIT_SYSTEMD
+ $(INSTALL) -D -m 644 package/connman/connman.service \
+ $(TARGET_DIR)/etc/systemd/system/connman.service
+ mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+ ln -fs ../connman.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service
+endef
ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
CONNMAN_CONF_OPT += --enable-client
diff --git a/package/connman/connman.service b/package/connman/connman.service
new file mode 100644
index 0000000..bb6b3c0
--- /dev/null
+++ b/package/connman/connman.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Connection service
+After=syslog.target
+
+[Service]
+Type=dbus
+BusName=net.connman
+Restart=on-failure
+ExecStart=/usr/bin/connmand -n
+
+[Install]
+WantedBy=multi-user.target
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 07/10] connman: add systemd unit file
2014-01-18 19:23 ` [Buildroot] [PATCH 07/10] connman: add systemd unit file Samuel Martin
@ 2014-01-18 19:56 ` Yann E. MORIN
2014-01-18 22:19 ` Lucas De Marchi
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 19:56 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> This patch cleans up the init material installation:
> - it uses the *_INSTALL_INIT_SYSV infra instead of the custom hook;
> - it add and install the systemd unit file
Please split this patch in two, then. One to switch to using the
_INSTALL_INIT_SYSV infra, the second to actually add the systemd unit.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 07/10] connman: add systemd unit file
2014-01-18 19:23 ` [Buildroot] [PATCH 07/10] connman: add systemd unit file Samuel Martin
2014-01-18 19:56 ` Yann E. MORIN
@ 2014-01-18 22:19 ` Lucas De Marchi
1 sibling, 0 replies; 29+ messages in thread
From: Lucas De Marchi @ 2014-01-18 22:19 UTC (permalink / raw)
To: buildroot
On Jan 18, 2014 5:24 PM, "Samuel Martin" <s.martin49@gmail.com> wrote:
>
> This patch cleans up the init material installation:
> - it uses the *_INSTALL_INIT_SYSV infra instead of the custom hook;
> - it add and install the systemd unit file
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> package/connman/connman.mk | 10 ++++++++--
> package/connman/connman.service | 12 ++++++++++++
> 2 files changed, 20 insertions(+), 2 deletions(-)
> create mode 100644 package/connman/connman.service
Why not enable the configure flag to install the systemd service from
upstream?
Lucas De Marchi
>
> diff --git a/package/connman/connman.mk b/package/connman/connman.mk
> index 64c1f0e..9161cce 100644
> --- a/package/connman/connman.mk
> +++ b/package/connman/connman.mk
> @@ -24,11 +24,17 @@ CONNMAN_DEPENDENCIES += \
> $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
> $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono)
>
> -define CONNMAN_INSTALL_INITSCRIPT
> +define CONNMAN_INSTALL_INIT_SYSV
> $(INSTALL) -m 0755 -D package/connman/S45connman
$(TARGET_DIR)/etc/init.d/S45connman
> endef
>
> -CONNMAN_POST_INSTALL_TARGET_HOOKS = CONNMAN_INSTALL_INITSCRIPT
> +define CONNMAN_INSTALL_INIT_SYSTEMD
> + $(INSTALL) -D -m 644 package/connman/connman.service \
> + $(TARGET_DIR)/etc/systemd/system/connman.service
> + mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
> + ln -fs ../connman.service \
> +
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service
> +endef
>
> ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y)
> CONNMAN_CONF_OPT += --enable-client
> diff --git a/package/connman/connman.service
b/package/connman/connman.service
> new file mode 100644
> index 0000000..bb6b3c0
> --- /dev/null
> +++ b/package/connman/connman.service
> @@ -0,0 +1,12 @@
> +[Unit]
> +Description=Connection service
> +After=syslog.target
> +
> +[Service]
> +Type=dbus
> +BusName=net.connman
> +Restart=on-failure
> +ExecStart=/usr/bin/connmand -n
> +
> +[Install]
> +WantedBy=multi-user.target
> --
> 1.8.5.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20140118/cf96d51f/attachment.html>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (6 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 07/10] connman: add systemd unit file Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-19 20:29 ` Peter Korsgaard
2014-01-18 19:23 ` [Buildroot] [PATCH 09/10] urg: make sdl support optional Samuel Martin
2014-01-18 19:23 ` [Buildroot] [PATCH 10/10] hostapd: fix static build failure Samuel Martin
9 siblings, 1 reply; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
Because the mkpasswd provided by some distribution does not support all
options used in the mkusers script, mkpasswd has been integrated as a
package.
However, using a custom rootfs skeleton, the host-mkpasswd target is not
automatically built, even if some packages add users.
In this case, to help the Buildroot users understanding what happen when
the mkpasswd from the host system is used (so, might fail), mkusers now
print a warning message explaining how to solve this.
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
support/scripts/mkusers | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/support/scripts/mkusers b/support/scripts/mkusers
index 3b287b8..dd011eb 100755
--- a/support/scripts/mkusers
+++ b/support/scripts/mkusers
@@ -52,6 +52,22 @@ PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;'
)"
#----------------------------------------------------------------------------
+check_mkpasswd() {
+ local mkpasswd_path="$(readlink -f $(which mkpasswd 2>/dev/null))"
+ local host_dir="$(readlink -f "${HOST_DIR}")"
+ case "${mkpasswd_path}" in
+ "${host_dir}"*) ;;
+ *)
+ error \
+ "WARNING: using mkpasswd from the host system: '%s'. %s%s%s\n" \
+ "${mkpasswd_path}" \
+ "To avoid build failures because of unsupported options by " \
+ "your host system's mkpasswd, make sure to use the one " \
+ "Buildroot provides, by building the 'host-mkpasswd' target."
+ ;;
+ esac
+}
+#----------------------------------------------------------------------------
get_uid() {
local username="${1}"
@@ -264,6 +280,7 @@ add_user_to_group() {
encode_password() {
local passwd="${1}"
+ check_mkpasswd
mkpasswd -m "${PASSWD_METHOD}" "${passwd}"
}
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system
2014-01-18 19:23 ` [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system Samuel Martin
@ 2014-01-19 20:29 ` Peter Korsgaard
2014-01-19 21:29 ` Yann E. MORIN
0 siblings, 1 reply; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:29 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
> Because the mkpasswd provided by some distribution does not support all
> options used in the mkusers script, mkpasswd has been integrated as a
> package.
> However, using a custom rootfs skeleton, the host-mkpasswd target is not
> automatically built, even if some packages add users.
> In this case, to help the Buildroot users understanding what happen when
> the mkpasswd from the host system is used (so, might fail), mkusers now
> print a warning message explaining how to solve this.
Why not just fix it to always use our mkpasswd? E.G. something like
adding host-mkpasswd to dependencies in fs/common.mk if PACKAGE_USERS
isn't empty?
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> support/scripts/mkusers | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
> diff --git a/support/scripts/mkusers b/support/scripts/mkusers
> index 3b287b8..dd011eb 100755
> --- a/support/scripts/mkusers
> +++ b/support/scripts/mkusers
> @@ -52,6 +52,22 @@ PASSWD_METHOD="$( sed -r -e '/^BR2_TARGET_GENERIC_PASSWD_METHOD="(.*)"$/!d;'
> )"
> #----------------------------------------------------------------------------
> +check_mkpasswd() {
> + local mkpasswd_path="$(readlink -f $(which mkpasswd 2>/dev/null))"
> + local host_dir="$(readlink -f "${HOST_DIR}")"
> + case "${mkpasswd_path}" in
> + "${host_dir}"*) ;;
> + *)
> + error \
> + "WARNING: using mkpasswd from the host system: '%s'. %s%s%s\n" \
> + "${mkpasswd_path}" \
> + "To avoid build failures because of unsupported options by " \
> + "your host system's mkpasswd, make sure to use the one " \
> + "Buildroot provides, by building the 'host-mkpasswd' target."
> + ;;
> + esac
> +}
> +#----------------------------------------------------------------------------
> get_uid() {
> local username="${1}"
> @@ -264,6 +280,7 @@ add_user_to_group() {
> encode_password() {
> local passwd="${1}"
> + check_mkpasswd
> mkpasswd -m "${PASSWD_METHOD}" "${passwd}"
> }
> --
> 1.8.5.3
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system
2014-01-19 20:29 ` Peter Korsgaard
@ 2014-01-19 21:29 ` Yann E. MORIN
0 siblings, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-19 21:29 UTC (permalink / raw)
To: buildroot
Peter, All,
On 2014-01-19 21:29 +0100, Peter Korsgaard spake thusly:
> >>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
>
> > Because the mkpasswd provided by some distribution does not support all
> > options used in the mkusers script, mkpasswd has been integrated as a
> > package.
>
> > However, using a custom rootfs skeleton, the host-mkpasswd target is not
> > automatically built, even if some packages add users.
>
> > In this case, to help the Buildroot users understanding what happen when
> > the mkpasswd from the host system is used (so, might fail), mkusers now
> > print a warning message explaining how to solve this.
>
> Why not just fix it to always use our mkpasswd? E.G. something like
> adding host-mkpasswd to dependencies in fs/common.mk if PACKAGE_USERS
> isn't empty?
We've already spoke about it with Samuel on IRC, and I was rather
leaning toward this: if the user uses a custom skeleton, lets just rely
on him to provide a proper set of users.
As an afterthought, I think this would not be correct from us, and that
we should indeed continue to generate those users.
So, agreed with Peter on that one. Sorry Samuel... :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 09/10] urg: make sdl support optional
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (7 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 08/10] support: mkusers: add warning when using mkpasswd from the host system Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 20:00 ` Yann E. MORIN
2014-01-19 20:31 ` Peter Korsgaard
2014-01-18 19:23 ` [Buildroot] [PATCH 10/10] hostapd: fix static build failure Samuel Martin
9 siblings, 2 replies; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
Only enable SDL support if SDL and SDL_net are already enabled in the
configuration.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/urg/Config.in | 5 ++---
package/urg/urg.mk | 10 +++++++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/package/urg/Config.in b/package/urg/Config.in
index ded8204..232f4c4 100644
--- a/package/urg/Config.in
+++ b/package/urg/Config.in
@@ -1,11 +1,10 @@
config BR2_PACKAGE_URG
bool "urg"
depends on BR2_INSTALL_LIBSTDCPP
- select BR2_PACKAGE_SDL
- select BR2_PACKAGE_SDL_NET
help
Library to control Hokuyo's URG series sensors.
- Requires SDL & SDL_net.
+
+ If SDL and SDL_net are enable, SDL support will be automatically added.
http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index e16393a..075a0b3 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -12,10 +12,14 @@ URG_LICENSE_FILES = COPYING
URG_INSTALL_STAGING = YES
-URG_DEPENDENCIES = sdl sdl_net
-
-URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
+ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy)
+URG_DEPENDENCIES += sdl sdl_net
+URG_CONF_OPT += --with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr
+else
+URG_CONF_OPT = --without-sdl
+URG_CONF_ENV += ac_cv_path_SDL_CONFIG=""
+endif
URG_CONFIG_SCRIPTS = c_urg-config urg-config
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 09/10] urg: make sdl support optional
2014-01-18 19:23 ` [Buildroot] [PATCH 09/10] urg: make sdl support optional Samuel Martin
@ 2014-01-18 20:00 ` Yann E. MORIN
2014-01-19 20:31 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 20:00 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> Only enable SDL support if SDL and SDL_net are already enabled in the
> configuration.
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
However, I have a comment, see below...
> ---
> package/urg/Config.in | 5 ++---
> package/urg/urg.mk | 10 +++++++---
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/package/urg/Config.in b/package/urg/Config.in
> index ded8204..232f4c4 100644
> --- a/package/urg/Config.in
> +++ b/package/urg/Config.in
> @@ -1,11 +1,10 @@
> config BR2_PACKAGE_URG
> bool "urg"
> depends on BR2_INSTALL_LIBSTDCPP
> - select BR2_PACKAGE_SDL
> - select BR2_PACKAGE_SDL_NET
> help
> Library to control Hokuyo's URG series sensors.
> - Requires SDL & SDL_net.
> +
> + If SDL and SDL_net are enable, SDL support will be automatically added.
I don't think we systematically add such info in the help entries.
I wonder if we should.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 09/10] urg: make sdl support optional
2014-01-18 19:23 ` [Buildroot] [PATCH 09/10] urg: make sdl support optional Samuel Martin
2014-01-18 20:00 ` Yann E. MORIN
@ 2014-01-19 20:31 ` Peter Korsgaard
1 sibling, 0 replies; 29+ messages in thread
From: Peter Korsgaard @ 2014-01-19 20:31 UTC (permalink / raw)
To: buildroot
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
> Only enable SDL support if SDL and SDL_net are already enabled in the
> configuration.
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
> package/urg/Config.in | 5 ++---
> package/urg/urg.mk | 10 +++++++---
> 2 files changed, 9 insertions(+), 6 deletions(-)
> diff --git a/package/urg/Config.in b/package/urg/Config.in
> index ded8204..232f4c4 100644
> --- a/package/urg/Config.in
> +++ b/package/urg/Config.in
> @@ -1,11 +1,10 @@
> config BR2_PACKAGE_URG
> bool "urg"
> depends on BR2_INSTALL_LIBSTDCPP
> - select BR2_PACKAGE_SDL
> - select BR2_PACKAGE_SDL_NET
> help
> Library to control Hokuyo's URG series sensors.
> - Requires SDL & SDL_net.
> +
> + If SDL and SDL_net are enable, SDL support will be automatically added.
Committed with this line dropped as pointed out by Yann, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 10/10] hostapd: fix static build failure
2014-01-18 19:23 [Buildroot] [PATCH 00/10] Misc fixes Samuel Martin
` (8 preceding siblings ...)
2014-01-18 19:23 ` [Buildroot] [PATCH 09/10] urg: make sdl support optional Samuel Martin
@ 2014-01-18 19:23 ` Samuel Martin
2014-01-18 20:05 ` Yann E. MORIN
9 siblings, 1 reply; 29+ messages in thread
From: Samuel Martin @ 2014-01-18 19:23 UTC (permalink / raw)
To: buildroot
When building statically hostapd with openssl support, it is necessary
to add -lz to LIBS to avoid undefined symbols when linking against
libcrypto.a.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/hostapd/hostapd.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 0fbd8bc..a978094 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -32,6 +32,7 @@ endef
# Try to use openssl if it's already available
ifeq ($(BR2_PACKAGE_OPENSSL),y)
HOSTAPD_DEPENDENCIES += openssl
+ HOSTAPD_LIBS += $(if $(BR2_PREFER_STATIC_LIB),-lcrypto -lz)
define HOSTAPD_TLS_CONFIG
$(SED) 's/\(#\)\(CONFIG_TLS=openssl\)/\2/' $(HOSTAPD_CONFIG)
$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG)
--
1.8.5.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* [Buildroot] [PATCH 10/10] hostapd: fix static build failure
2014-01-18 19:23 ` [Buildroot] [PATCH 10/10] hostapd: fix static build failure Samuel Martin
@ 2014-01-18 20:05 ` Yann E. MORIN
2014-02-10 11:53 ` Samuel Martin
0 siblings, 1 reply; 29+ messages in thread
From: Yann E. MORIN @ 2014-01-18 20:05 UTC (permalink / raw)
To: buildroot
Samuel, All,
On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
> When building statically hostapd with openssl support, it is necessary
> to add -lz to LIBS to avoid undefined symbols when linking against
> libcrypto.a.
>
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Shouldn't we fix openssl's libcrypto.pc instead?
Adding -lz to Libs.private should do the trick, I guess, no?
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 29+ messages in thread
* [Buildroot] [PATCH 10/10] hostapd: fix static build failure
2014-01-18 20:05 ` Yann E. MORIN
@ 2014-02-10 11:53 ` Samuel Martin
0 siblings, 0 replies; 29+ messages in thread
From: Samuel Martin @ 2014-02-10 11:53 UTC (permalink / raw)
To: buildroot
On Sat, Jan 18, 2014 at 9:05 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Samuel, All,
>
> On 2014-01-18 20:23 +0100, Samuel Martin spake thusly:
>> When building statically hostapd with openssl support, it is necessary
>> to add -lz to LIBS to avoid undefined symbols when linking against
>> libcrypto.a.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>
> Shouldn't we fix openssl's libcrypto.pc instead?
> Adding -lz to Libs.private should do the trick, I guess, no?
>
Well, both openssl and hostapd use custom build-system (ie.
handwritten configure script and makefiles)...
What a pity! :-(
- on the openssl side:
when building the static library, the libcrypto.pc is wrong because of
what Yann points out (no -lz in Libs.private);
- on the hostapd side:
they just don't care/check about linking against the static library of
libcrypto, they just only add -lcrypto to the ldflags.
So, the right fix would be fixing the *.pc generation in openssl and
call pkg-config to set the cflags and ldflags in hostapd but add a
host-pkgconf dependency.
OTOH, the quickest fix is this patch...
Any input about the preferred way to fix it is welcome.
Regards,
--
Samuel
^ permalink raw reply [flat|nested] 29+ messages in thread