pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qemu-git: Remove local patch for ivshmem



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri May 26 06:44:13 2017 +0200
Changeset:	a45f6af864d5e86666e4329629a70d8efe6adff4

Modified Files:
	qemu-git/distinfo
	qemu-git/patches/patch-configure
Removed Files:
	qemu-git/patches/patch-Makefile

Log Message:
qemu-git: Remove local patch for ivshmem

It will be redone from scratch for upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a45f6af864d5e86666e4329629a70d8efe6adff4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qemu-git/distinfo                |  3 +--
 qemu-git/patches/patch-Makefile  | 12 ------------
 qemu-git/patches/patch-configure | 41 ----------------------------------------
 3 files changed, 1 insertion(+), 55 deletions(-)

diffs:
diff --git a/qemu-git/distinfo b/qemu-git/distinfo
index d1bc66beb9..596bcdd5f4 100644
--- a/qemu-git/distinfo
+++ b/qemu-git/distinfo
@@ -4,6 +4,5 @@ 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) = 0ba16abccc18a2fd32f3be434462572fe3e8d25c
-SHA1 (patch-configure) = af6f90677c78458808b64b02b30ce5b87da7ca97
+SHA1 (patch-configure) = df32a9268118f97bfc38c0c934a442b8d445e905
 SHA1 (patch-disas_libvixl_Makefile.objs) = 5bc8da5c29c95d18d415fad5936e7c2bf9d48b57
diff --git a/qemu-git/patches/patch-Makefile b/qemu-git/patches/patch-Makefile
deleted file mode 100644
index 1e8c59cb6e..0000000000
--- a/qemu-git/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- Makefile.orig	2017-04-25 12:42:53.000000000 +0000
-+++ Makefile
-@@ -473,6 +473,7 @@ ivshmem-client$(EXESUF): $(ivshmem-clien
- 	$(call LINK, $^)
- ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
- 	$(call LINK, $^)
-+ivshmem-server$(EXESUF): LIBS += $(LIBS_SHMLIB)
- 
- module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
- 	$(call quiet-command,$(PYTHON) $< $@ \
diff --git a/qemu-git/patches/patch-configure b/qemu-git/patches/patch-configure
index c458136caa..c2a2e3cabc 100644
--- a/qemu-git/patches/patch-configure
+++ b/qemu-git/patches/patch-configure
@@ -2,14 +2,6 @@ $NetBSD$
 
 --- configure.orig	2017-05-12 22:04:02.000000000 +0000
 +++ configure
-@@ -179,6 +179,7 @@ audio_pt_int=""
- audio_win_int=""
- cc_i386=i386-pc-linux-gnu-gcc
- libs_qga=""
-+libs_shmlib=""
- debug_info="yes"
- stack_protector=""
- 
 @@ -3034,14 +3035,13 @@ if test "$curses" != "no" ; then
  #include <curses.h>
  #include <wchar.h>
@@ -26,36 +18,3 @@ $NetBSD$
  }
  EOF
    IFS=:
-@@ -4133,6 +4133,24 @@ elif compile_prog "" "$pthread_lib -lrt"
-   libs_qga="$libs_qga -lrt"
- fi
- 
-+##########################################
-+# Do we need librt for shm_open()
-+cat > $TMPC <<EOF
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <stddef.h>
-+int main(void) {
-+  return shm_open(NULL, O_RDWR, 0644);
-+}
-+EOF
-+
-+if compile_prog "" "" ; then
-+  :
-+elif compile_prog "" "-lrt" ; then
-+  libs_shmlib="$libs_shmlib -lrt"
-+fi
-+
- if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
-         "$aix" != "yes" -a "$haiku" != "yes" ; then
-     libs_softmmu="-lutil $libs_softmmu"
-@@ -5949,6 +5967,7 @@ echo "EXESUF=$EXESUF" >> $config_host_ma
- echo "DSOSUF=$DSOSUF" >> $config_host_mak
- echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
- echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
-+echo "LIBS_SHMLIB+=$libs_shmlib" >> $config_host_mak
- echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak
- echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak
- echo "POD2MAN=$POD2MAN" >> $config_host_mak


Home | Main Index | Thread Index | Old Index