From 9c50159d432a8a604c42eade6c6db7eb8a6332f5 Mon Sep 17 00:00:00 2001 From: riastradh Date: Sat, 15 Apr 2017 17:38:48 +0000 Subject: Restore @PREFIX@, not accidental personal /dist/pkg directory. --- emulators/qemu/distinfo | 4 ++-- emulators/qemu/patches/patch-configure | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'emulators') diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index 7b10826ad83..212cfc1f44c 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.123 2017/04/07 13:32:52 ryoon Exp $ +$NetBSD: distinfo,v 1.124 2017/04/15 17:38:48 riastradh Exp $ SHA1 (qemu-2.8.1.tar.bz2) = 224289c5e568e400920363820a0647e2aca569e7 RMD160 (qemu-2.8.1.tar.bz2) = 93f71138d19c871195c9e0b1a7ba66275773f93a SHA512 (qemu-2.8.1.tar.bz2) = 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda Size (qemu-2.8.1.tar.bz2) = 28366270 bytes SHA1 (patch-Makefile.objs) = f40deeed5482a24369e898411bb611be418dc3ca -SHA1 (patch-configure) = 302d0ed283947b943e7fbcdd1138ba5fad3d1683 +SHA1 (patch-configure) = 4d6e0737cfbd9efcd02ab43c219fed0f0a1a55a9 SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7 SHA1 (patch-disas_libvixl_vixl_a64_disasm-a64.cc) = 0660a0c2d37c332fcd1e00edb2dc3c52fe179cc9 SHA1 (patch-disas_libvixl_vixl_utils.h) = 85285473b6021f9a0d190832d03c60c4d9df6bb7 diff --git a/emulators/qemu/patches/patch-configure b/emulators/qemu/patches/patch-configure index 8e8bb2b195f..40dda94cd1f 100644 --- a/emulators/qemu/patches/patch-configure +++ b/emulators/qemu/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.17 2017/02/27 05:19:29 adam Exp $ +$NetBSD: patch-configure,v 1.18 2017/04/15 17:38:48 riastradh Exp $ Don't use gld on SunOS Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least). @@ -21,8 +21,8 @@ avoid bad substitution else - curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:" - curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw" -+ curses_inc_list="$(/dist/pkg/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:" -+ curses_lib_list="$(/dist/pkg/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw" ++ curses_inc_list="$(@PREFIX@/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:" ++ curses_lib_list="$(@PREFIX@/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw" fi curses_found=no cat > $TMPC << EOF -- cgit v1.2.3