View | Details | Raw Unified | Return to bug 214484 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 lines)
Lines 250-261 Link Here
250
PLIST_SUB+=	LINUXBOOT_DMA=""
250
PLIST_SUB+=	LINUXBOOT_DMA=""
251
.endif
251
.endif
252
252
253
# -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
254
# but it shouldn't matter much
255
post-patch:
253
post-patch:
256
	@${MV} ${WRKDIR}/dtc ${WRKSRC}
254
	@${MV} ${WRKDIR}/dtc ${WRKSRC}
257
	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
258
		${WRKSRC}/configure
259
	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
255
	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
260
# clang in freebsd 10 is unable to assemble linuxboot_dma.bin
256
# clang in freebsd 10 is unable to assemble linuxboot_dma.bin
261
.if (${OSVERSION} < 1100000)
257
.if (${OSVERSION} < 1100000)
(-)files/patch-configure (+17 lines)
Line 0 Link Here
1
bug 214484 - pkg-config --cflags-only-I ncurses
2
3
--- configure.orig	2016-11-10 11:32:23.000000000 -0700
4
+++ configure.1	2016-11-13 09:06:21.654976000 -0700
5
@@ -2977,10 +2977,10 @@
6
 # curses probe
7
 if test "$curses" != "no" ; then
8
   if test "$mingw32" = "yes" ; then
9
-    curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
10
+    curses_inc_list="$($pkg_config --cflags-only-I ncurses 2>/dev/null):"
11
     curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
12
   else
13
-    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
14
+    curses_inc_list="$($pkg_config --cflags-only-I ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
15
     curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
16
   fi
17
   curses_found=no

Return to bug 214484