openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 16:33:41 +02:00
Code Issues Releases Wiki Activity

Makefile: fix overriding of make command line arguments

Browse Source 
Command line arguments given when executing make should not stop us
from setting commonly user-configurable variables like CPPFLAGS or
LDFLAGS.
Without this patch 'make CPPFLAGS="-Ifail"' would fail to find
libusb1 headers and abort.
Add override statements where we append mandatory options to
these variables to make (Debian) packagers more happy.

Also, r1920 introduced some explicit calls to pkg-config instead of
$(PKG_CONFIG). This patch corrects that as well.

Corresponding to flashrom svn r1931.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Stefan Tauner 2016-02-19 08:17:24 +00:00
parent 1c2d23a22d
commit 45207061d8
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -67,14 +67,14 @@ CFLAGS += -Werror
endif endif
ifdef LIBS_BASE ifdef LIBS_BASE
CPPFLAGS += -I$(LIBS_BASE)/include
LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib
PKG_CONFIG_LIBDIR ?= $(LIBS_BASE)/lib/pkgconfig PKG_CONFIG_LIBDIR ?= $(LIBS_BASE)/lib/pkgconfig
override CPPFLAGS += -I$(LIBS_BASE)/include
override LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib
endif endif
ifeq ($(CONFIG_STATIC),yes) ifeq ($(CONFIG_STATIC),yes)
PKG_CONFIG += --static override PKG_CONFIG += --static
LDFLAGS += -static override LDFLAGS += -static
endif endif
# Set LC_ALL=C to minimize influences of the locale. # Set LC_ALL=C to minimize influences of the locale.
@ -112,34 +112,34 @@ endif
override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"'))
ifeq ($(TARGET_OS), Darwin) ifeq ($(TARGET_OS), Darwin)
CPPFLAGS += -I/opt/local/include -I/usr/local/include override CPPFLAGS += -I/opt/local/include -I/usr/local/include
LDFLAGS += -L/opt/local/lib -L/usr/local/lib override LDFLAGS += -L/opt/local/lib -L/usr/local/lib
endif endif
ifeq ($(TARGET_OS), FreeBSD) ifeq ($(TARGET_OS), FreeBSD)
CPPFLAGS += -I/usr/local/include override CPPFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib override LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(TARGET_OS), OpenBSD) ifeq ($(TARGET_OS), OpenBSD)
CPPFLAGS += -I/usr/local/include override CPPFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib override LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(TARGET_OS), NetBSD) ifeq ($(TARGET_OS), NetBSD)
CPPFLAGS += -I/usr/pkg/include override CPPFLAGS += -I/usr/pkg/include
LDFLAGS += -L/usr/pkg/lib override LDFLAGS += -L/usr/pkg/lib
endif endif
ifeq ($(TARGET_OS), DragonFlyBSD) ifeq ($(TARGET_OS), DragonFlyBSD)
CPPFLAGS += -I/usr/local/include override CPPFLAGS += -I/usr/local/include
LDFLAGS += -L/usr/local/lib override LDFLAGS += -L/usr/local/lib
endif endif
ifeq ($(TARGET_OS), DOS) ifeq ($(TARGET_OS), DOS)
EXEC_SUFFIX := .exe EXEC_SUFFIX := .exe
# DJGPP has odd uint*_t definitions which cause lots of format string warnings. # DJGPP has odd uint*_t definitions which cause lots of format string warnings.
CFLAGS += -Wno-format override CFLAGS += -Wno-format
LIBS += -lgetopt LIBS += -lgetopt
# Bus Pirate, Serprog and PonyProg are not supported under DOS (missing serial support). # Bus Pirate, Serprog and PonyProg are not supported under DOS (missing serial support).
ifeq ($(CONFIG_BUSPIRATE_SPI), yes) ifeq ($(CONFIG_BUSPIRATE_SPI), yes)
@ -821,11 +821,11 @@ ifeq ($(TARGET_OS),$(filter $(TARGET_OS),FreeBSD DragonFlyBSD))
USB1LIBS += -lusb USB1LIBS += -lusb
else else
ifeq ($(TARGET_OS),NetBSD) ifeq ($(TARGET_OS),NetBSD)
CPPFLAGS += -I/usr/pkg/include/libusb-1.0 override CPPFLAGS += -I/usr/pkg/include/libusb-1.0
USB1LIBS += -lusb-1.0 USB1LIBS += -lusb-1.0
else else
USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --libs libusb-1.0 || printf "%s" "-lusb-1.0") USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libusb-1.0 || printf "%s" "-lusb-1.0")
CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0")
endif endif
endif endif
endif endif