package: cleanup PKG_CONFIG_SYSROOT

PKG_CONFIG_SYSROOT_DIR and friends get set in package/Makefile.in,
so there's no need to set it in the makefiles of the individual
packages as well.

Based on a patch by Markus Heidelberg.

diff --git a/package/audio/libogg/libogg.mk b/package/audio/libogg/libogg.mk
index 91deabee55ebd135e50abb5c0d63e425c0bca99d..c1b1216d0da995a04021ea0bcaa9b946c259febc 100644 (file)
--- a/package/audio/libogg/libogg.mk
+++ b/package/audio/libogg/libogg.mk
@@ -24,9 +24,6 @@ $(LIBOGG_DIR)/.configured: $(LIBOGG_DIR)/.source
                $(TARGET_CONFIGURE_ARGS) \
                $(TARGET_CONFIGURE_OPTS) \
                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 6e72ad586ffdb08a784995b2bca4be87218b195d..a42ba3b45fa23b8537abc45cc12db18c3cd8ec3b 100644 (file)
--- a/package/audio/libvorbis/libvorbis.mk
+++ b/package/audio/libvorbis/libvorbis.mk
@@ -23,9 +23,6 @@ $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
                $(TARGET_CONFIGURE_ARGS) \
                $(TARGET_CONFIGURE_OPTS) \
                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 f8f6360e31d76b65615ec0d7b3edbbe7658b5590..339e5fc186a34552d650ccc44eda971906fb6d8f 100644 (file)
--- a/package/docker/docker.mk
+++ b/package/docker/docker.mk
@@ -14,10 +14,7 @@ DOCKER_MAKE_OPT = CC=$(TARGET_CC) CXX=$(TARGET_CXX) LD=$(TARGET_LD) \
                                        CFLAGS="-I$(STAGING_DIR)/usr/include \
                                                -I$(STAGING_DIR)/usr/include/glib-2.0 \
                                                -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_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+                                       LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib"
 
 DOCKER_INSTALL_TARGET_OPT = PREFIX=$(TARGET_DIR)/usr install
 

diff --git a/package/editors/vim/vim.mk b/package/editors/vim/vim.mk
index cc15bf643592bc2ef58cff078d4a7977e55baba4..a9d79ed492cdcd03eec42e82982a7c8a0e6f51a7 100644 (file)
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -36,14 +36,8 @@ $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
 
 $(VIM_DIR)/.configured: $(VIM_DIR)/.patched
        (cd $(VIM_DIR)/src; \
-               PATH=$(TARGET_PATH) \
-               CC="$(TARGET_CC)" \
-               CPP="$(TARGET_CPP)" \
                CFLAGS="$(TARGET_CFLAGS)" \
                STRIP="$(TARGET_STRIP)" \
-               PKG_CONFIG_SYSROOT="$(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 \
                PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
         $(TARGET_CONFIGURE_ARGS) \