packages/utils/mmc-utils/Makefile
Michael Heimpold 0db8bac00c mmc-utils: don't set -D_FORTIFY_SOURCE in Makefile, take 2
Also already mentioned in ba4338d6f7,
the security feature FORTIFY_SOURCE could be set globally.
The current approach tries to undefine and redefine it, however,
the order on the command line prevents this from being successfully, e.g.:

arm-openwrt-linux-muslgnueabi-gcc  ... -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ... -D_FORTIFY_SOURCE=1 ...
                                       `---------------v-------------------'     `--------v--------'
                                                   AM_CFLAGS                        OpenWrt params

So to have the original source (static) _FORTIFY_SOURCE=2 define,
the only option is to remove it from AM_CFLAGS completely, and
to pass it after the OpenWrt settings explicitely in the Makefile.

This should fix the buildbots finally.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2015-08-30 14:33:46 +02:00

56 lines
1.4 KiB
Makefile

#
# Copyright (C) 2015 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=mmc-utils
PKG_VERSION=2015-05-01-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
PKG_SOURCE_VERSION:=d0b46442b50794217e53b2455c1344c548d9d088
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_SOURCE_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/mmc-utils
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Userspace tools for MMC/SD devices
URL:=http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
endef
define Package/mmc-utils/description
This package contains the userspace mmc utils, the userspace
counterpart to the Linux MMC/SD subsystem.
endef
define Build/Configure
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" \
mmc
endef
define Package/mmc-utils/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/mmc $(1)/sbin
endef
$(eval $(call BuildPackage,mmc-utils))