diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-03 15:59:35 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-04-03 15:59:35 +0000 |
| commit | c10059752ae1d0b9f2289a369b2dd579d3ec5241 (patch) | |
| tree | 0f092942a7e1f0761406dad68f19275a7e24c482 /sys-freebsd/freebsd-ubin/files | |
| parent | Revision bump, add gcc 4.1 patch submitted by Robert Marmorstein <rmmarm@wm.e... (diff) | |
| download | gentoo-2-c10059752ae1d0b9f2289a369b2dd579d3ec5241.tar.gz gentoo-2-c10059752ae1d0b9f2289a369b2dd579d3ec5241.tar.bz2 gentoo-2-c10059752ae1d0b9f2289a369b2dd579d3ec5241.zip | |
Add patch that makes mkioctl only look into the original includes, so that it doesn't get confused when Xorg is installed.
(Portage version: 2.1_pre7-r3)
Diffstat (limited to 'sys-freebsd/freebsd-ubin/files')
| -rw-r--r-- | sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 | 3 | ||||
| -rw-r--r-- | sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 index 2091b60b68a2..e884b08aa329 100644 --- a/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 +++ b/sys-freebsd/freebsd-ubin/files/digest-freebsd-ubin-6.0-r1 @@ -7,6 +7,9 @@ SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 freebsd- MD5 7c2af3af5be2f46372f9cc0efaeda4c7 freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 freebsd-etc-6.0.tar.bz2 178941 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 freebsd-etc-6.0.tar.bz2 178941 +MD5 0a5937660818157a2a0bf09fe705f24c freebsd-include-6.0.tar.bz2 127219 +RMD160 683fe6cf84961d0019c742f4e1fc0e4bfb18b60c freebsd-include-6.0.tar.bz2 127219 +SHA256 9da34ffd474e023fe7dd203cb035d97726eb8e7bea7e9566249e62da4039be8b freebsd-include-6.0.tar.bz2 127219 MD5 3888da5da1cb329a65a3ac9d316f99ea freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 freebsd-lib-6.0.tar.bz2 2613087 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 freebsd-lib-6.0.tar.bz2 2613087 diff --git a/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch new file mode 100644 index 000000000000..a89cf52dfc4c --- /dev/null +++ b/sys-freebsd/freebsd-ubin/files/freebsd-ubin-6.0-kdump-ioctl.patch @@ -0,0 +1,28 @@ +By default the mkioctl program that generates code for kdump does look for +ioctls in the whole /usr/include tree, but this does break when xorg is merged. +This patch allows to look for include files only in the source tree. + +Index: fbsd-6/usr.bin/kdump/Makefile +=================================================================== +--- fbsd-6.orig/usr.bin/kdump/Makefile ++++ fbsd-6/usr.bin/kdump/Makefile +@@ -10,6 +10,6 @@ CFLAGS+= -I${.CURDIR}/../ktrace -I${.CUR + CLEANFILES= ioctl.c + + ioctl.c: mkioctls +- sh ${.CURDIR}/mkioctls ${DESTDIR}/usr/include > ${.TARGET} ++ sh ${.CURDIR}/mkioctls ${.CURDIR}/../../include > ${.TARGET} + + .include <bsd.prog.mk> +Index: fbsd-6/usr.bin/truss/Makefile +=================================================================== +--- fbsd-6.orig/usr.bin/truss/Makefile ++++ fbsd-6/usr.bin/truss/Makefile +@@ -29,6 +29,6 @@ syscalls.h: syscalls.master + ${.CURDIR}/i386.conf + + ioctl.c: ${.CURDIR}/../kdump/mkioctls +- sh ${.CURDIR}/../kdump/mkioctls ${DESTDIR}/usr/include > ${.TARGET} ++ sh ${.CURDIR}/../kdump/mkioctls ${.CURDIR}/../../include > ${.TARGET} + + .include <bsd.prog.mk> |