diff options
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/e2fsprogs/Makefile | 4 | ||||
| -rw-r--r-- | package/utils/spidev_test/Makefile | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 247b5ed4a4..8649fff425 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -127,14 +127,14 @@ endef define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/util \ - BUILDCC="$(HOSTCC)" \ + BUILD_CC="$(HOSTCC)" \ CFLAGS="" \ CPPFLAGS="" \ LDFLAGS="" \ subst +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ LDFLAGS=-Wl,--gc-sections \ - BUILDCC="$(HOSTCC)" \ + BUILD_CC="$(HOSTCC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ LIBBLKID="$(PKG_BUILD_DIR)/lib/libblkid.a -luuid" \ all diff --git a/package/utils/spidev_test/Makefile b/package/utils/spidev_test/Makefile index 807039a1f5..2a2122cfbd 100644 --- a/package/utils/spidev_test/Makefile +++ b/package/utils/spidev_test/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009 OpenWrt.org +# Copyright (C) 2009-2016 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,6 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=spidev-test -PKG_RELEASE:=$(LINUX_VERSION) include $(INCLUDE_DIR)/package.mk @@ -18,21 +17,26 @@ define Package/spidev-test CATEGORY:=Utilities DEPENDS:=+kmod-spi-dev TITLE:=SPI testing utility - VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) + VERSION:=$(LINUX_VERSION) URL:=http://www.kernel.org - MAINTAINER:=Florian Fainelli <florian@openwrt.org> endef define Package/spidev-test/description SPI testing utility. endef +ifeq ($(call kernel_patchver_ge,4.5.0),1) + SPIDEV_TEST_C:=$(LINUX_DIR)/tools/spi/spidev_test.c +else + SPIDEV_TEST_C:=$(LINUX_DIR)/Documentation/spi/spidev_test.c +endif + define Build/Prepare endef define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/spidev_test \ - $(LINUX_DIR)/Documentation/spi/spidev_test.c + $(SPIDEV_TEST_C) endef define Package/spidev-test/install |