diff options
| -rw-r--r-- | debian/patches/ioctl-fix0001-fix-Xioctl-proto.defs-creation.patch | 66 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 67 deletions
diff --git a/debian/patches/ioctl-fix0001-fix-Xioctl-proto.defs-creation.patch b/debian/patches/ioctl-fix0001-fix-Xioctl-proto.defs-creation.patch deleted file mode 100644 index 5066a111..00000000 --- a/debian/patches/ioctl-fix0001-fix-Xioctl-proto.defs-creation.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 847591f173627441fdab42edbfbbe058ccb511d9 Mon Sep 17 00:00:00 2001 -From: Bartlomiej Puget <larhard@gmail.com> -Date: Mon, 22 Feb 2016 02:50:14 +0100 -Subject: [PATCH hurd] fix Xioctl-proto.defs creation - ---- - hurd/Makefile | 4 ++-- - hurd/gensym.awk | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/hurd/Makefile b/hurd/Makefile -index 4273ff3..2902d47 100644 ---- a/hurd/Makefile -+++ b/hurd/Makefile -@@ -58,7 +58,7 @@ hurd.msgids: $(patsubst %.defs,%.msgids,$(filter %.defs,$(INSTHDRS))) - %.symc.o: %.symc - $(CC) -S $(CPPFLAGS) $(CFLAGS) $(CPPFLAGS-$@) -x c -o $@ $< - %.h: %.symc.o -- sed <$< -e 's/^[^*].*$$//' | \ -+ sed <$< -e 's/^[[:space:]]*//' -e 's/^[^*].*$$//' | \ - sed -e 's/^[*]/#define/' -e 's/mAgIc[^-0-9]*//' -e '/^ *$$/d' >$@ - - %-ioctls.sym: tmpl-ioctls.sym -@@ -69,7 +69,7 @@ cpp = $(CC) $(CPPFLAGS) $(CFLAGS) $(CPPFLAGS-$@) -E -x c - %ioctl-requests.list: %ioctl-headers.h - $(cpp) $< | sed -n 's/^#.*"\([^"]*\)".*$$/\1/p' | sort | uniq | \ - while read f; do \ -- sed -n 's/^[ ]*#[ ]*define[ ]*\([A-Z0-9_]*\)[^A-Z0-9_][^A-Z0-9_]*_IO.*'\'$*\'.*$$'/\1/p' $$f; \ -+ sed -n 's/^[ ]*#[ ]*define[ ]*\([A-Z0-9_]*\)[^A-Z0-9_][^A-Z0-9_]*_IO.*'\'$*\''.*$$/\1/p' $$f; \ - done | sort | uniq > $@ - - %ioctl.defs: %ioctl.sym -diff --git a/hurd/gensym.awk b/hurd/gensym.awk -index 6c6e1a1..e5157c3 100644 ---- a/hurd/gensym.awk -+++ b/hurd/gensym.awk -@@ -34,7 +34,7 @@ BEGIN { - - # Take an arbitrarily complex C symbol or expression and constantize it. - /^expr/ { -- print "__asm (\""; -+ printf "__asm (\""; - if ($3 == "") - printf "* %s mAgIc%%0\" : : \"i\" (%s));\n", $2, $2; - else -@@ -43,7 +43,7 @@ BEGIN { - - # Output a symbol defining the size of a C structure. - /^size/ { -- print "__asm (\""; -+ printf "__asm (\""; - if ($4 == "") - printf "* %s_SIZE mAgIc%%0\" : : \"i\" (sizeof(struct %s)));\n", - toupper($3), $2; -@@ -54,7 +54,7 @@ BEGIN { - - # Output a symbol defining the byte offset of an element of a C structure. - /^offset/ { -- print "__asm (\""; -+ printf "__asm (\""; - if ($5 == "") - { - printf "* %s_%s mAgIc%%0\" : : \"i\" (&((struct %s*)0)->%s));\n", --- -2.1.4 - diff --git a/debian/patches/series b/debian/patches/series index 0a01d700..a2db4949 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -37,4 +37,3 @@ exec_filename0003-Use-the-new-_hurd_exec_file_name-function.patch exec_filename0004-This-patch-is-an-amendment-of-exec_filename_exec.pat.patch gpg0001-trans-add-transparent-GnuPG-translator.patch crash0001-xxx-crash-logging-works.patch -ioctl-fix0001-fix-Xioctl-proto.defs-creation.patch |