diff options
| author | Etienne Brateau <etienne.brateau@gmail.com> | 2021-11-25 17:44:15 +0000 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2023-06-24 00:00:02 +1000 |
| commit | e14424490daa1137a4b314ecf0ca7aa90de4280f (patch) | |
| tree | 7b74c037cf7ab165f86cf1ba8516088be7d5cec1 | |
| parent | 0acdd51b1d7f803656c4effc9dcbb1f509743e0d (diff) | |
Don’t include sys/evcnt.h if the header does not exists
| -rw-r--r-- | debian/patches/rumpuser-evcnt.diff | 56 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 57 insertions, 0 deletions
diff --git a/debian/patches/rumpuser-evcnt.diff b/debian/patches/rumpuser-evcnt.diff new file mode 100644 index 00000000..41b81ab7 --- /dev/null +++ b/debian/patches/rumpuser-evcnt.diff @@ -0,0 +1,56 @@ +diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c b/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c +index 5d3a1c438..6ce2ff35e 100644 +--- a/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c ++++ b/buildrump.sh/src/lib/librumpuser/rumpuser_dl.c +@@ -45,7 +45,9 @@ __RCSID("$NetBSD: rumpuser_dl.c,v 1.33 2020/03/22 13:30:10 pgoyette Exp $"); + + #include <sys/types.h> + #include <sys/time.h> ++#if defined(HAVE_SYS_EVCNT) + #include <sys/evcnt.h> ++#endif + + #include <assert.h> + +@@ -384,6 +386,7 @@ process_object(void *handle, + assert(sfp == sfp_end); + } + ++#if defined(HAVE_SYS_EVCNT) + /* handle link_set_evcnts */ + evp = dlsym(handle, "__start_link_set_evcnts"); + evp_end = dlsym(handle, "__stop_link_set_evcnts"); +@@ -392,6 +395,7 @@ process_object(void *handle, + doevcntattach(*evp); + assert(evp == evp_end); + } ++#endif + } + + /* +diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in b/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in +index b008c0621..f4c9615d5 100644 +--- a/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in ++++ b/buildrump.sh/src/lib/librumpuser/rumpuser_config.h.in +@@ -102,6 +102,9 @@ + /* Define to 1 if you have the <sys/dkio.h> header file. */ + #undef HAVE_SYS_DKIO_H + ++/* Define to 1 if you have the <sys/evcnt.h> header file. */ ++#undef HAVE_SYS_EVCNT_H ++ + /* Define to 1 if you have the <sys/param.h> header file. */ + #undef HAVE_SYS_PARAM_H + +diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h +index 5c5cc8f83..fa4ed2e55 100644 +--- a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h ++++ b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h +@@ -41,6 +41,7 @@ + #define HAVE_SYS_DISKLABEL_H 1 + #define HAVE_SYS_DISK_H 1 + #define HAVE_SYS_DKIO_H 1 ++#define HAVE_SYS_EVCNT_H 1 + #define HAVE_SYS_PARAM_H 1 + #define HAVE_SYS_STAT_H 1 + #define HAVE_SYS_SYSCTL_H 1 diff --git a/debian/patches/series b/debian/patches/series index 66b931d1..e3ad761d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ dealloc.diff netbsd-build.diff no-virtio-rump.diff pci-userspace-rump.diff +rumpuser-evcnt.diff |