Index: head/emulators/qemu-powernv/Makefile =================================================================== --- head/emulators/qemu-powernv/Makefile (revision 531652) +++ head/emulators/qemu-powernv/Makefile (revision 531653) @@ -1,57 +1,57 @@ # $FreeBSD$ PORTNAME= qemu-powernv PORTVERSION= 3.0.50 PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://people.freebsd.org/~kbowling/distfiles/ MAINTAINER= kbowling@FreeBSD.org COMMENT= Fork of QEMU with experimental PowerNV emulation support LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libfdt.so:sysutils/dtc USES= bison:build compiler:c11 gmake gnome libtool makeinfo \ pkgconfig python:build tar:bz2 xorg USE_XORG= pixman -USE_GNOME= glib20 +USE_GNOME= glib20 libxml2 HAS_CONFIGURE= yes CONFIGURE_ARGS+=--target-list=ppc64-softmmu \ --cc=${CC} \ --disable-curl \ --disable-docs \ --disable-gtk \ --disable-gcrypt \ --disable-kvm \ --disable-libssh2 \ --disable-linux-aio \ --disable-linux-user \ --disable-vnc \ --disable-sdl \ --disable-nettle \ --disable-gnutls \ --disable-vte \ --disable-xen \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \ --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --localstatedir=/var \ --datadir=${DATADIR} \ --python=${PYTHON_CMD} PLIST_FILES= bin/qemu-system-powernv \ ${DATADIR}/qemu/skiboot.lid \ ${DATADIR}/qemu/slof.bin \ ${DATADIR}/qemu/spapr-rtas.bin # remap names to avoid conflicts with mainline port do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ppc64-softmmu/qemu-system-ppc64 ${STAGEDIR}${PREFIX}/bin/qemu-system-powernv ${MKDIR} ${STAGEDIR}${DATADIR}/qemu ${INSTALL_DATA} ${WRKSRC}/pc-bios/skiboot.lid ${STAGEDIR}${DATADIR}/qemu/skiboot.lid ${INSTALL_DATA} ${WRKSRC}/pc-bios/slof.bin ${STAGEDIR}${DATADIR}/qemu/slof.bin ${INSTALL_DATA} ${WRKSRC}/pc-bios/spapr-rtas.bin ${STAGEDIR}${DATADIR}/qemu/spapr-rtas.bin .include Index: head/emulators/qemu-powernv/files/patch-configure =================================================================== --- head/emulators/qemu-powernv/files/patch-configure (nonexistent) +++ head/emulators/qemu-powernv/files/patch-configure (revision 531653) @@ -0,0 +1,74 @@ +--- configure.orig 2019-12-12 02:59:10 UTC ++++ configure +@@ -3261,10 +3261,10 @@ fi + # 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 +@@ -3381,7 +3381,7 @@ for i in $glib_modules; do + glib_libs=$($pkg_config --libs $i) + QEMU_CFLAGS="$glib_cflags $QEMU_CFLAGS" + LIBS="$glib_libs $LIBS" +- libs_qga="$glib_libs $libs_qga" ++ libs_qga="$glib_libs -lintl $libs_qga" + else + error_exit "glib-$glib_req_ver $i is required to compile QEMU" + fi +@@ -5517,27 +5517,30 @@ if ( [ "$linux_user" = yes ] || [ "$bsd_user" = yes ] + cat > $TMPC </dev/null 2>&1; then +- error_exit \ +- "We need to link the QEMU user mode binaries at a" \ +- "specific text address. Unfortunately your linker" \ +- "doesn't support either the -Ttext-segment option or" \ +- "printing the default linker script with --verbose." \ +- "If you don't want the user mode binaries, pass the" \ +- "--disable-user option to configure." +- fi ++ textseg_ldflags="-Wl,-Ttext-segment=$textseg_addr" ++ if ! compile_prog "" "$textseg_ldflags"; then ++ # In case ld does not support -Ttext-segment, edit the default linker ++ # script via sed to set the .text start addr. This is needed on FreeBSD ++ # at least. ++ if ! $ld --verbose >/dev/null 2>&1; then ++ error_exit \ ++ "We need to link the QEMU user mode binaries at a" \ ++ "specific text address. Unfortunately your linker" \ ++ "doesn't support either the -Ttext-segment option or" \ ++ "printing the default linker script with --verbose." \ ++ "If you don't want the user mode binaries, pass the" \ ++ "--disable-user option to configure." ++ fi + +- $ld --verbose | sed \ +- -e '1,/==================================================/d' \ +- -e '/==================================================/,$d' \ +- -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ +- -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld +- textseg_ldflags="-Wl,-T../config-host.ld" ++ $ld --verbose | sed \ ++ -e '1,/==================================================/d' \ ++ -e '/==================================================/,$d' \ ++ -e "s/[.] = [0-9a-fx]* [+] SIZEOF_HEADERS/. = $textseg_addr + SIZEOF_HEADERS/" \ ++ -e "s/__executable_start = [0-9a-fx]*/__executable_start = $textseg_addr/" > config-host.ld ++ textseg_ldflags="-Wl,-T../config-host.ld" ++ fi + fi + fi + fi Property changes on: head/emulators/qemu-powernv/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property