freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel/mspdebug: fix include order

Browse Source 
The default include order in the Makefile preferred global directories
over local ones. Thus, ftdi.h from an installed libftdi was considered
instead of the internal ftdi.h, leading to compilation errors in this
situation.

Reported by:	holm@freibergnet.de
Approved by:	(maintainer timeout)
Differential Revision:	https://reviews.freebsd.org/D47975
This commit is contained in:
Joerg Wunsch 2024-12-11 21:35:45 +01:00
parent 4a23b974d4
commit 506e265d16
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
devel/mspdebug/files/patch-Makefile
View File

@ -1,28 +1,37 @@
--- Makefile.orig 2015-10-16 19:45:43 UTC --- Makefile.orig 2020-04-01 23:27:59.000000000 +0200
+++ Makefile +++ Makefile 2024-12-06 23:27:08.863198000 +0100
@@ -22,8 +22,9 @@ PREFIX ?= /usr/local @@ -23,7 +23,8 @@ LDFLAGS ?= -s
LDFLAGS ?= -s
BINDIR = ${PREFIX}/bin/ BINDIR = ${PREFIX}/bin/
-MANDIR = ${PREFIX}/share/man/man1 MANDIR = ${PREFIX}/share/man/man1
-LIBDIR = ${PREFIX}/lib/ -LIBDIR = ${PREFIX}/lib/
+MANDIR = ${PREFIX}/share/man/man1
+DATDIR = ${PREFIX}/share +DATDIR = ${PREFIX}/share
+DOCDIR = ${PREFIX}/share/doc/mspdebug +DOCDIR = ${PREFIX}/share/doc/mspdebug
ifdef WITHOUT_READLINE UNAME_S := $(shell sh -c 'uname -s')
READLINE_CFLAGS = UNAME_O := $(shell sh -c 'uname -o 2> /dev/null')
@@ -70,6 +71,9 @@ else @@ -73,7 +74,7 @@ else
ifeq ($(UNAME_S),Darwin) # Mac OS X/MacPorts stuff
ifeq ($(shell fink -V > /dev/null 2>&1 && echo ok),ok)
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb)
- PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -ltermcap -pthread
+ PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -pthread
else ifeq ($(shell brew --version > /dev/null 2>&1 && echo ok),ok)
PORTS_CFLAGS := $(shell pkg-config --cflags hidapi libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs hidapi libusb) -framework IOKit -framework CoreFoundation
@@ -89,7 +90,10 @@ else
LDFLAGS =
else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),) else ifneq ($(filter $(UNAME_S),OpenBSD NetBSD DragonFly),)
PORTS_CFLAGS := $(shell pkg-config --cflags libusb) PORTS_CFLAGS := $(shell pkg-config --cflags libusb)
PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread - PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -ltermcap -pthread
+ PORTS_LDFLAGS := $(shell pkg-config --libs libusb) -pthread
+ else ifeq ($(UNAME_S),FreeBSD) + else ifeq ($(UNAME_S),FreeBSD)
+ PORTS_CFLAGS := -I${PREFIX}/include + PORTS_CFLAGS := -I${PREFIX}/include
+ PORTS_LDFLAGS := -L${PREFIX}/lib + PORTS_LDFLAGS := -L${PREFIX}/lib
else else
PORTS_CFLAGS := PORTS_CFLAGS :=
PORTS_LDFLAGS := PORTS_LDFLAGS :=
@@ -78,7 +82,7 @@ endif @@ -98,12 +102,12 @@ endif
INCLUDES = -I. -Isimio -Iformats -Itransport -Idrivers -Iutil -Iui INCLUDES = -I. -Isimio -Iformats -Itransport -Idrivers -Iutil -Iui
GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb GCC_CFLAGS = -O1 -Wall -Wno-char-subscripts -ggdb
@ -30,8 +39,15 @@
+CONFIG_CFLAGS = -DLIB_DIR=\"$(DATDIR)\" +CONFIG_CFLAGS = -DLIB_DIR=\"$(DATDIR)\"
MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS) MSPDEBUG_LDFLAGS = $(LDFLAGS) $(PORTS_LDFLAGS)
MSPDEBUG_LIBS = -lusb $(READLINE_LIBS) $(OS_LIBS) MSPDEBUG_LIBS = -L. -lusb $(READLINE_LIBS) $(OS_LIBS)
@@ -108,9 +112,12 @@ install: $(BINARY) mspdebug.man -MSPDEBUG_CFLAGS = $(CFLAGS) $(READLINE_CFLAGS) $(PORTS_CFLAGS)\
- $(GCC_CFLAGS) $(INCLUDES) $(CONFIG_CFLAGS) $(OS_CFLAGS)
+MSPDEBUG_CFLAGS = $(CFLAGS) $(INCLUDES) $(READLINE_CFLAGS) $(PORTS_CFLAGS)\
+ $(GCC_CFLAGS) $(CONFIG_CFLAGS) $(OS_CFLAGS)
all: $(BINARY)
@@ -136,9 +140,12 @@ install: $(BINARY) mspdebug.man
$(INSTALL) -m 0755 $(BINARY) $(DESTDIR)$(BINDIR) $(INSTALL) -m 0755 $(BINARY) $(DESTDIR)$(BINDIR)
mkdir -p $(DESTDIR)$(MANDIR) mkdir -p $(DESTDIR)$(MANDIR)
$(INSTALL) -m 0644 mspdebug.man $(DESTDIR)$(MANDIR)/mspdebug.1 $(INSTALL) -m 0644 mspdebug.man $(DESTDIR)$(MANDIR)/mspdebug.1
@ -45,5 +61,5 @@
+ $(INSTALL) -m 0644 README EmbeddedMode.txt \ + $(INSTALL) -m 0644 README EmbeddedMode.txt \
+ $(DESTDIR)$(DOCDIR)/ + $(DESTDIR)$(DOCDIR)/
.SUFFIXES: .c .o uninstall:
$(RM) $(DESTDIR)$(BINDIR)$(BINARY) $(DESTDIR)$(MANDIR)/mspdebug.1\