Skip to contentSkip to conversation

package: remove/replace PKG_CONFIG_SYSROOT

PATCH New Markus Heidelberg 3 participants 4 messages Oct 24, 2008 – Oct 26, 2008

lore
Share & tools
lore

Markus Heidelberg

author
#0 lore raw

PATCH 1/1 package: remove/replace PKG_CONFIG_SYSROOT

PKG_CONFIG_SYSROOT is not recognized by pkg-config, PKG_CONFIG_SYSROOT_DIR is the valid environment variable name.

---
 package/audio/libogg/libogg.mk       |    1 -
 package/audio/libvorbis/libvorbis.mk |    1 -
 package/docker/docker.mk             |    2 +-
 package/editors/vim/vim.mk           |    2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
package/audio/libogg/libogg.mk +0 -1
index 91deabe..27ecfd1 100644
@@ -26,7 +26,6 @@ $(LIBOGG_DIR)/.configured: $(LIBOGG_DIR)/.source
 		CFLAGS="$(TARGET_CFLAGS)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
-		PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
package/audio/libvorbis/libvorbis.mk +0 -1
index 6e72ad5..19ac354 100644
@@ -25,7 +25,6 @@ $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
 		CFLAGS="$(TARGET_CFLAGS)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
-		PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
package/docker/docker.mk +1 -1
index f8f6360..78137cc 100644
@@ -16,7 +16,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
 						-I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
 					LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 					PKGCONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
-					PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
+					PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 					PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
package/editors/vim/vim.mk +1 -1
index cc15bf6..2979a42 100644
@@ -41,7 +41,7 @@ $(VIM_DIR)/.configured: $(VIM_DIR)/.patched
 		CPP="$(TARGET_CPP)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		STRIP="$(TARGET_STRIP)" \
-		PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
+		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
Signature · 1 line
1.5.6.4
#1 lore raw

PATCH 1/1 package: remove/replace PKG_CONFIG_SYSROOT

Le Sat, 25 Oct 2008 01:08:06 +0200,
Markus Heidelberg <[email protected]> a ?crit :

Quoted 2 lines

PKG_CONFIG_SYSROOT is not recognized by pkg-config, PKG_CONFIG_SYSROOT_DIR is the valid environment variable name.

These variables are already defined in TARGET_CONFIGURE_OPTS in package/Makefile.in. Just drop them in your packages.

Sincerly,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 package: remove/replace PKG_CONFIG_SYSROOT

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Le Sat, 25 Oct 2008 01:08:06 +0200,
Thomas> Markus Heidelberg <[email protected]> a ?crit :

Quoted 2 lines
Quoted 2 lines

PKG_CONFIG_SYSROOT is not recognized by pkg-config, PKG_CONFIG_SYSROOT_DIR is the valid environment variable name.

Thomas> These variables are already defined in TARGET_CONFIGURE_OPTS in Thomas> package/Makefile.in. Just drop them in your packages.

Exactly. I've fixed that in r23794.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 1/1 package: remove/replace PKG_CONFIG_SYSROOT

In reply to Thomas Petazzoni

Thomas Petazzoni, 25.10.2008:

Quoted 8 lines

Le Sat, 25 Oct 2008 01:08:06 +0200,
Markus Heidelberg <[email protected]> a ?crit :

Quoted 2 lines

PKG_CONFIG_SYSROOT is not recognized by pkg-config, PKG_CONFIG_SYSROOT_DIR is the valid environment variable name.

These variables are already defined in TARGET_CONFIGURE_OPTS in package/Makefile.in. Just drop them in your packages.

I know, so I just removed it in libogg and libvorbis. Docker uses Makefile.autotools.in, here I forgot to just remove it. In vim TARGET_CONFIGURE_OPTS are not used, so I had to change SYSROOT to SYSROOT_DIR. I don't use any of these packages but wanted to get rid of the wrong PKG_CONFIG_SYSROOT_DIR variables in Buildroot, confusing me while working on other packages using pkg-config. I don't wanted to risk side effects, so I did the minimal work.

When cleaning up the PKG_CONFIG stuff, there are 12 packages defining these variables on their own instead of using them from Makefile.in:

find package -name *.mk -exec echo {} \; -exec grep -w "PKG_CONFIG\(\|_PATH\|SYSROOT_DIR\)" {} \; | grep PKG_CONFIG -B 1

Also, since libogg and libvorbis used /lib/pkgconfig in addition to the normal /usr/lib/pkgconfig I just kept it in there.

Markus