Commit 8a89d2b3 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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

package/audio/libogg/libogg.mk

+0 −3
Original line number Diff line number Diff line
@@ -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) \

package/audio/libvorbis/libvorbis.mk

+0 −3
Original line number Diff line number Diff line
@@ -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) \

package/docker/docker.mk

+1 −4
Original line number Diff line number Diff line
@@ -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

package/editors/vim/vim.mk

+0 −6
Original line number Diff line number Diff line
@@ -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) \