Changeset View
Changeset View
Standalone View
Standalone View
head/sysutils/x86info/files/patch-Makefile
| --- Makefile.orig 2016-10-12 19:04:55 UTC | --- Makefile.orig 2017-09-06 10:17:13.000000000 -0600 | ||||
| +++ Makefile | +++ Makefile 2018-01-11 10:23:07.741490000 -0700 | ||||
| @@ -18,6 +18,7 @@ CFLAGS += -Wstrict-prototypes -Wmissing- | @@ -39,7 +39,7 @@ | ||||
| CFLAGS += -Wswitch-enum | LDFLAGS += $(shell pkg-config --libs libpci) | ||||
| CFLAGS += -Wundef | |||||
| CFLAGS += -Wwrite-strings | |||||
| +CFLAGS += `pkg-config --cflags libpci` | |||||
| # gcc specific | |||||
| ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1) | |||||
| @@ -37,7 +38,7 @@ CFLAGS += $(shell if [ $(CPP_MAJOR) -eq | |||||
| LDFLAGS = -Wl,-z,relro,-z,now | |||||
| ifeq ($(CC),"") | ifeq ($(CC),"") | ||||
| -CC = gcc | -CC = gcc | ||||
| +CC ?= gcc | +CC ?= gcc | ||||
| endif | endif | ||||
| ifdef STATIC_LIBPCI | ifdef STATIC_LIBPCI | ||||
| @@ -50,7 +51,7 @@ SHELL = /bin/sh | @@ -52,7 +52,7 @@ | ||||
| V = @ | V = @ | ||||
| Q = $(V:1=) | Q = $(V:1=) | ||||
| -QUIET_CC = $(Q:@=@echo ' CC '$@;) | -QUIET_CC = $(Q:@=@echo ' CC '$@;) | ||||
| +#QUIET_CC = $(Q:@=@echo ' CC '$@;) | +#QUIET_CC = $(Q:@=@echo ' CC '$@;) | ||||
| all: x86info | all: x86info | ||||
| @@ -67,7 +68,7 @@ X86INFO_OBJS = $(sort $(patsubst %.c,%.o | @@ -69,7 +69,7 @@ | ||||
| x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS) | x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS) | ||||
| $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o x86info $(X86INFO_OBJS) \ | ||||
| - $(LIBPCI) | - $(LIBPCI) | ||||
| + `pkg-config --libs libpci` $(LIBPCI) | + `pkg-config --libs libpci` $(LIBPCI) | ||||
| DEPDIR= .deps | DEPDIR= .deps | ||||
| -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d) | -include $(X86INFO_SRC:%.c=$(DEPDIR)/%.d) | ||||