[Buildroot] [PATCH] package: remove/replace PKG_CONFIG_SYSROOT

[Buildroot] [PATCH] package: remove/replace PKG_CONFIG_SYSROOT

[Markus Heidelberg]

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(-)

diff --git a/package/audio/libogg/libogg.mk b/package/audio/libogg/libogg.mk
index 91deabe..27ecfd1 100644
--- a/package/audio/libogg/libogg.mk
+++ b/package/audio/libogg/libogg.mk
@@ -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) \
diff --git a/package/audio/libvorbis/libvorbis.mk b/package/audio/libvorbis/libvorbis.mk
index 6e72ad5..19ac354 100644
--- a/package/audio/libvorbis/libvorbis.mk
+++ b/package/audio/libvorbis/libvorbis.mk
@@ -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) \
diff --git a/package/docker/docker.mk b/package/docker/docker.mk
index f8f6360..78137cc 100644
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -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
diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk
index cc15bf6..2979a42 100644
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -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 \
-- 
1.5.6.4

[Buildroot] [PATCH] package: remove/replace PKG_CONFIG_SYSROOT

[Thomas Petazzoni]

Le Sat, 25 Oct 2008 01:08:06 +0200,
Markus Heidelberg <markus.heidelberg@web.de> a ?crit :

> 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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers and embedded Linux development,
consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH] package: remove/replace PKG_CONFIG_SYSROOT

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Le Sat, 25 Oct 2008 01:08:06 +0200,
 Thomas> Markus Heidelberg <markus.heidelberg@web.de> a ?crit :

 >> 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.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH] package: remove/replace PKG_CONFIG_SYSROOT

[Markus Heidelberg]

Thomas Petazzoni, 25.10.2008:
> Le Sat, 25 Oct 2008 01:08:06 +0200,
> Markus Heidelberg <markus.heidelberg@web.de> a ?crit :
> 
> > 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