Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Nov 2016 02:58:57 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426079 - in head/emulators/qemu-sbruno: . files
Message-ID:  <201611140258.uAE2wvpe040431@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Mon Nov 14 02:58:57 2016
New Revision: 426079
URL: https://svnweb.freebsd.org/changeset/ports/426079

Log:
  Fix build with devel/ncurses installed.
  
  PR:	214484
  Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>

Added:
  head/emulators/qemu-sbruno/files/patch-configure   (contents, props changed)
Modified:
  head/emulators/qemu-sbruno/Makefile

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Mon Nov 14 02:45:26 2016	(r426078)
+++ head/emulators/qemu-sbruno/Makefile	Mon Nov 14 02:58:57 2016	(r426079)
@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.7.50.g20161111
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	GH \
 		LOCAL/nox:dtc \
@@ -250,12 +251,8 @@ PLIST_SUB+=	LINUXBOOT_DMA="@comment "
 PLIST_SUB+=	LINUXBOOT_DMA=""
 .endif
 
-# -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
-# but it shouldn't matter much
 post-patch:
 	@${MV} ${WRKDIR}/dtc ${WRKSRC}
-	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 # clang in freebsd 10 is unable to assemble linuxboot_dma.bin
 .if (${OSVERSION} < 1100000)

Added: head/emulators/qemu-sbruno/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/qemu-sbruno/files/patch-configure	Mon Nov 14 02:58:57 2016	(r426079)
@@ -0,0 +1,15 @@
+--- configure.orig	2016-11-10 11:32:23.000000000 -0700
++++ configure	2016-11-13 09:06:21.654976000 -0700
+@@ -2977,10 +2977,10 @@
+ # curses probe
+ if test "$curses" != "no" ; then
+   if test "$mingw32" = "yes" ; then
+-    curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
++    curses_inc_list="$($pkg_config --cflags-only-I ncurses 2>/dev/null):"
+     curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
+   else
+-    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
++    curses_inc_list="$($pkg_config --cflags-only-I ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
+     curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
+   fi
+   curses_found=no



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611140258.uAE2wvpe040431>