diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2015-01-06 19:47:28 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2015-01-06 19:47:28 +0000 |
| commit | dbc8d4a8be751066be977999cb8e6bd9d56cd6e6 (patch) | |
| tree | 98ea2e3e5e43b906f6267887acd9ac55a87c2af4 /emulators/qemu-devel/files/patch-configure | |
| parent | Update to GNU Chess 6.2.1 (diff) | |
- Update emulators/qemu-sbruno to latest github snapshot, fixing
the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
w/o bsd-user patches and knob again. (Or at least until the
patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
PORTREVISION.
Suggested by: andrew [1] (for the benefit of testing aarch64 guests)
Diffstat (limited to 'emulators/qemu-devel/files/patch-configure')
| -rw-r--r-- | emulators/qemu-devel/files/patch-configure | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/emulators/qemu-devel/files/patch-configure b/emulators/qemu-devel/files/patch-configure index e87341476e6b..7a0be6132bbb 100644 --- a/emulators/qemu-devel/files/patch-configure +++ b/emulators/qemu-devel/files/patch-configure @@ -1,24 +1,24 @@ --- a/configure +++ a/configure -@@ -192,7 +192,7 @@ gcov="no" - gcov_tool="gcov" - EXESUF="" +@@ -273,7 +273,7 @@ DSOSUF=".so" + LDFLAGS_SHARED="-shared" + modules="no" prefix="/usr/local" -mandir="\${prefix}/share/man" +mandir="\${prefix}/man" datadir="\${prefix}/share" qemu_docdir="\${prefix}/share/doc/qemu" bindir="\${prefix}/bin" -@@ -1980,7 +1980,7 @@ if test "$gtk" != "no"; then - if $pkg_config --exists "$gtkpackage >= $gtkversion"; then - gtk_cflags=`$pkg_config --cflags $gtkpackage` - gtk_libs=`$pkg_config --libs $gtkpackage` +@@ -2062,7 +2062,7 @@ if test "$gtk" != "no"; then + if $pkg_config --exists "$gtkx11package >= $gtkversion"; then + gtk_libs="$gtk_libs -lX11" + fi - libs_softmmu="$gtk_libs $libs_softmmu" + libs_softmmu="$gtk_libs -lintl $libs_softmmu" gtk="yes" elif test "$gtk" = "yes"; then - feature_not_found "gtk" "Install gtk2 or gtk3 (requires --with-gtkabi=3.0 option to configure) devel" -@@ -3320,15 +3320,18 @@ if compile_prog "" "" ; then + feature_not_found "gtk" "Install gtk2 or gtk3 devel" +@@ -3500,15 +3500,18 @@ if compile_prog "" "" ; then fi # Check if tools are available to build documentation. @@ -45,7 +45,7 @@ fi # Search for bswap_32 function -@@ -3498,6 +3501,17 @@ fi +@@ -3650,6 +3653,17 @@ fi # check for libusb if test "$libusb" != "no" ; then @@ -63,7 +63,7 @@ if $pkg_config --atleast-version=1.0.13 libusb-1.0; then libusb="yes" libusb_cflags=$($pkg_config --cflags libusb-1.0) -@@ -3510,6 +3524,7 @@ if test "$libusb" != "no" ; then +@@ -3662,6 +3676,7 @@ if test "$libusb" != "no" ; then fi libusb="no" fi |