diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-26 06:19:43 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-10-26 06:19:43 +0000 |
| commit | 8a89d2b3f36d58fb0f13d57cf50c5a8cf84ea466 (patch) | |
| tree | 163991bbdf63986534074db47aa4d66375e7de73 /package | |
| parent | ae116fece66893b098ecd4ddf8f7a546cc04411c (diff) | |
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.
Diffstat (limited to 'package')
| -rw-r--r-- | package/audio/libogg/libogg.mk | 3 | ||||
| -rw-r--r-- | package/audio/libvorbis/libvorbis.mk | 3 | ||||
| -rw-r--r-- | package/docker/docker.mk | 5 | ||||
| -rw-r--r-- | package/editors/vim/vim.mk | 6 |
4 files changed, 1 insertions, 16 deletions
diff --git a/package/audio/libogg/libogg.mk b/package/audio/libogg/libogg.mk index 91deabee5..c1b1216d0 100644 --- 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 6e72ad586..a42ba3b45 100644 --- 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 f8f6360e3..339e5fc18 100644 --- 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 cc15bf643..a9d79ed49 100644 --- 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) \ |