diff options
| author | Etienne Brateau <etienne.brateau@gmail.com> | 2021-11-25 02:38:57 +0000 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2023-06-24 00:00:01 +1000 |
| commit | 0acdd51b1d7f803656c4effc9dcbb1f509743e0d (patch) | |
| tree | 9ba32973c7bb16947130528d8a22b4f54f6161bb | |
| parent | 1a628be4d6b72fe684f377d0fd834be85a383af2 (diff) | |
Replace a patch by a configure step for librumpuser
| -rw-r--r-- | debian/patches/rumpuser-port.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 |
3 files changed, 2 insertions, 22 deletions
diff --git a/debian/patches/rumpuser-port.diff b/debian/patches/rumpuser-port.diff deleted file mode 100644 index b76b97ca..00000000 --- a/debian/patches/rumpuser-port.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h -index 5c5cc8f83..467ac86e8 100644 ---- a/buildrump.sh/src/lib/librumpuser/rumpuser_port.h -+++ b/buildrump.sh/src/lib/librumpuser/rumpuser_port.h -@@ -19,7 +19,6 @@ - #define HAVE_CLOCK_GETTIME 1 - #define HAVE_CLOCK_NANOSLEEP 1 - #define HAVE_DLINFO 1 --#define HAVE_FSYNC_RANGE 1 - #define HAVE_GETENV_R 1 - #define HAVE_GETPROGNAME 1 - #define HAVE_GETSUBOPT 1 -@@ -29,6 +28,7 @@ - #define HAVE_PATHS_H 1 - #define HAVE_POSIX_MEMALIGN 1 - #define HAVE_PTHREAD_SETNAME3 1 -+#define HAVE_REGISTER_T 1 - #define HAVE_SETPROGNAME 1 - #define HAVE_STDINT_H 1 - #define HAVE_STDLIB_H 1 diff --git a/debian/patches/series b/debian/patches/series index aba7a7ed..66b931d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,5 +10,4 @@ ahcisata-atapi.diff dealloc.diff netbsd-build.diff no-virtio-rump.diff -rumpuser-port.diff pci-userspace-rump.diff diff --git a/debian/rules b/debian/rules index 5423ad5c..cd8d16e3 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,7 @@ override_dh_auto_clean: override_dh_auto_build-arch: dh_testdir -a + cd buildrump.sh/src/lib/librumpuser && ./configure cd buildrump.sh/src && HOST_CC=gcc \ LDADD="-L/usr/lib/i386-gnu -L/lib/i386-gnu" \ _GCC_CRTENDS= _GCC_CRTEND= _GCC_CRTBEGINS= _GCC_CRTBEGIN= _GCC_CRTI= _GCC_CRTN= \ @@ -37,7 +38,7 @@ override_dh_auto_build-arch: -V TOOLS_BUILDRUMP=yes -V MKGROFF=no -V TOPRUMP="$(CURDIR)/buildrump.sh/src/sys/rump" \ -V BUILDRUMP_CPPFLAGS="-Wno-error=stringop-overread" \ -V RUMPUSER_EXTERNAL_DPLIBS=pthread \ - -V CPPFLAGS="-I../../obj/destdir.i386/usr/include -D_FILE_OFFSET_BITS=64 -DRUMP_REGISTER_T=int" \ + -V CPPFLAGS="-I../../obj/destdir.i386/usr/include -D_FILE_OFFSET_BITS=64 -DRUMP_REGISTER_T=int -DRUMPUSER_CONFIG=yes " \ -V CWARNFLAGS="-Wno-error=maybe-uninitialized -Wno-error=address-of-packed-member -Wno-error=unused-variable -Wno-error=stack-protector -Wno-error=array-parameter -Wno-error=array-bounds -Wno-error=stringop-overflow" \ -V LIBCRTBEGIN=" " -V LIBCRTEND=" " -V LIBCRT0=" " -V LIBCRTI=" " \ -V _GCC_CRTENDS=" " -V _GCC_CRTEND=" " \ |