Browse Source

- remove obsolete PKG_CONFIG_PATH calls

master
vanhofen 4 years ago
parent
commit
3648159f04
  1. 2
      make/environment-build.mk
  2. 2
      make/neutrino-plugins.mk
  3. 5
      make/neutrino.mk
  4. 1
      make/target-libs-static.mk

2
make/environment-build.mk

@ -263,7 +263,7 @@ MAKE_ENV = \
MAKE_ENV += \
PKG_CONFIG=$(PKG_CONFIG) \
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
CONFIGURE_OPTS = \
--build=$(BUILD) \

2
make/neutrino-plugins.mk

@ -133,7 +133,6 @@ endef
# -----------------------------------------------------------------------------
neutrino-plugins: neutrino $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)
$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR) install DESTDIR=$(TARGET_DIR)
$(NEUTRINO-PLUGINS_RUNLEVEL-LINKS_INSTALL)
@ -161,7 +160,6 @@ neutrino-plugins-clean-all: neutrino-plugins-clean
# make neutrino-plugin-<subdir>; e.g. make neutrino-plugin-tuxwetter
neutrino-plugin-%: $(NEUTRINO-PLUGINS_BUILD_DIR)/config.status
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@))
$(MAKE) -C $(NEUTRINO-PLUGINS_BUILD_DIR)/$(subst neutrino-plugin-,,$(@)) install DESTDIR=$(TARGET_DIR)

5
make/neutrino.mk

@ -73,7 +73,7 @@ NEUTRINO_CONF_ENV = \
NEUTRINO_CONF_ENV += \
PKG_CONFIG=$(PKG_CONFIG) \
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
# -----------------------------------------------------------------------------
@ -169,7 +169,6 @@ $(NEUTRINO_BUILD_DIR)/config.status: $(NEUTRINO_DEPS)
# -----------------------------------------------------------------------------
neutrino: $(NEUTRINO_BUILD_DIR)/config.status
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(MAKE) -C $(NEUTRINO_BUILD_DIR)
$(MAKE) -C $(NEUTRINO_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
$(MAKE) $(TARGET_sysconfdir)/init.d/start_neutrino
@ -224,7 +223,6 @@ $(LIBSTB-HAL_BUILD_DIR)/config.status: $(LIBSTB-HAL_DEPS)
# -----------------------------------------------------------------------------
libstb-hal: $(LIBSTB-HAL_BUILD_DIR)/config.status
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR)
$(MAKE) -C $(LIBSTB-HAL_BUILD_DIR) install DESTDIR=$(NEUTRINO_INST_DIR)
$(REWRITE_LIBTOOL_LA)
@ -237,7 +235,6 @@ ifeq ($(CLEAN),yes)
$(MAKE) neutrino-clean
endif
$(MAKE) $(NEUTRINO_BUILD_DIR)/config.status
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
$(MAKE) -C $(NEUTRINO_BUILD_DIR)
$(INSTALL_EXEC) -D $(NEUTRINO_BUILD_DIR)/src/neutrino $(TARGET_bindir)/neutrino
ifneq ($(DEBUG),yes)

1
make/target-libs-static.mk

@ -35,7 +35,6 @@ $(STATIC_libdir)/libcortex-strings.la: $(DL_DIR)/$(CORTEX-STRINGS_SOURCE) | $(ST
CPPFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
CXXFLAGS="-pipe -O2 $(TARGET_DEBUGGING) $(CXX11_ABI) -I$(TARGET_includedir)" \
LDFLAGS="-Wl,-O1 -L$(TARGET_libdir)" \
PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
./configure $(CONFIGURE_OPTS) \
--prefix=$(prefix) \
--disable-shared \

Loading…
Cancel
Save