Skip to contentSkip to conversation

pkg-cmake.mk: set pkg-config env. vars. in the host configure environment

PATCH New Samuel Martin 2 participants 3 messages Aug 5, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pkg-cmake.mk: set pkg-config env. vars. in the host configure environment

Cmake may run pkg-config to find the dependencies when configuring a package. Because of the value of PATH, and it will use the Buildroot's pkg-config wrapper, which, by default, is configured (via some environment variables) to find the target dependencies.

So, this change makes sure the pkg-config environment variables are properly set for finding host dependencies when configuring a host-package.

---
 package/pkg-cmake.mk | 5 +++++
 1 file changed, 5 insertions(+)
package/pkg-cmake.mk +5 -0
index 914bda7482..a91b0c2f57 100644
@@ -109,6 +109,11 @@ define $(2)_CONFIGURE_CMDS
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
 	PATH=$$(BR_PATH) \
+	PKG_CONFIG="$$(PKG_CONFIG_HOST_BINARY)" \
+	PKG_CONFIG_SYSROOT_DIR="/" \
+	PKG_CONFIG_LIBDIR="$$(HOST_DIR)/lib/pkgconfig:$$(HOST_DIR)/share/pkgconfig"
+	PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 	$$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
 		-DCMAKE_INSTALL_SO_NO_EXE=0 \
 		-DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \
Signature · 1 line
2.13.4
#1 lore raw

PATCH 1/1 pkg-cmake.mk: set pkg-config env. vars. in the host configure environment

Hello,

Quoted 10 lines · Samuel Martin

Cmake may run pkg-config to find the dependencies when configuring a package. Because of the value of PATH, and it will use the Buildroot's pkg-config wrapper, which, by default, is configured (via some environment variables) to find the target dependencies.

So, this change makes sure the pkg-config environment variables are properly set for finding host dependencies when configuring a host-package.

Is this fixing a particular autobuild failure ?

Is this fixing a specific bug ?

I do remember someone reporting CMake related issues when building host packages. Perhaps it was an e-mail. In such a case, there should be a reference to this e-mail, or bug, or autobuild failure.

Currently, it's not clear whether your patch is fixing an actual problem (and should be applied to master) or is just nice to have (should be applied to next).

Of course, I do know that this patch is important and should be applied to master, but it would be good to have a clearer commit log from that respect.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 pkg-cmake.mk: set pkg-config env. vars. in the host configure environment

Quoted 12 lines · Thomas Petazzoni

Hello,

Quoted 9 lines · Samuel Martin

Cmake may run pkg-config to find the dependencies when configuring a package. Because of the value of PATH, and it will use the Buildroot's pkg-config wrapper, which, by default, is configured (via some environment variables) to find the target dependencies.

So, this change makes sure the pkg-config environment variables are properly set for finding host dependencies when configuring a host-package.

Quoted 5 lines
Quoted 1 line

Is this fixing a particular autobuild failure ?

Is this fixing a specific bug ?

No such a specific thing, just a mail reporting the issue [1].

Do you want me to file a ticket to have a trace in the bug tracker and add its ref. to the commit log?

Quoted 4 lines

I do remember someone reporting CMake related issues when building host packages. Perhaps it was an e-mail. In such a case, there should be a reference to this e-mail, or bug, or autobuild failure.

Unfortunately the abo have not (yet) trigger this bug for host-mariadb (I have not checked for other potentially affected packages).

Quoted 4 lines

Currently, it's not clear whether your patch is fixing an actual problem (and should be applied to master) or is just nice to have (should be applied to next).

IMHO, it's for master.

Quoted 5 lines

Of course, I do know that this patch is important and should be applied to master, but it would be good to have a clearer commit log from that respect.

Quoted 7 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[1] http://lists.busybox.net/pipermail/buildroot/2017-August/199776.html

Regards,

Signature · 1 line
Samuel