Gentoo Archives: gentoo-commits

From: "Javier Villavicencio (the_paya)" <the_paya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-freebsd/boot0/files: boot0-7.0-gentoo.patch
Date: Thu, 22 Jan 2009 21:00:24
Message-Id: E1LQ6eW-0007Vm-D5@stork.gentoo.org
1 the_paya 09/01/22 20:59:52
2
3 Added: boot0-7.0-gentoo.patch
4 Log:
5 Import of the 7.1 ebuilds from gentoo-bsd overlay.
6 (Portage version: 2.2_rc23/cvs/FreeBSD i386)
7
8 Revision Changes Path
9 1.1 sys-freebsd/boot0/files/boot0-7.0-gentoo.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch?rev=1.1&content-type=text/plain
13
14 Index: boot0-7.0-gentoo.patch
15 ===================================================================
16 diff -ur ../src.orig/sys/boot/efi/libefi/Makefile sys/boot/efi/libefi/Makefile
17 --- ../src.orig/sys/boot/efi/libefi/Makefile 2006-11-05 23:03:03.000000000 +0100
18 +++ sys/boot/efi/libefi/Makefile 2008-03-14 11:15:48.482695423 +0100
19 @@ -8,7 +8,7 @@
20
21 CFLAGS+= -I${.CURDIR}/../include
22 CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/}
23 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
24 +CFLAGS+= -I/usr/include/libstand
25
26 # Pick up the bootstrap header for some interface items
27 CFLAGS+= -I${.CURDIR}/../../common
28 diff -ur ../src.orig/sys/boot/i386/boot2/Makefile sys/boot/i386/boot2/Makefile
29 --- ../src.orig/sys/boot/i386/boot2/Makefile 2007-05-19 07:07:47.000000000 +0200
30 +++ sys/boot/i386/boot2/Makefile 2008-03-14 11:21:16.247014910 +0100
31 @@ -24,7 +24,7 @@
32 -fno-guess-branch-probability \
33 -fomit-frame-pointer \
34 -fno-unit-at-a-time \
35 - -mno-align-long-strings \
36 + -march=i586 \
37 -mrtd \
38 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \
39 -D${BOOT2_UFS} \
40 diff -ur ../src.orig/sys/boot/i386/libfirewire/Makefile sys/boot/i386/libfirewire/Makefile
41 --- ../src.orig/sys/boot/i386/libfirewire/Makefile 2007-05-29 16:35:57.000000000 +0200
42 +++ sys/boot/i386/libfirewire/Makefile 2008-03-14 11:15:48.502696288 +0100
43 @@ -10,7 +10,7 @@
44 CFLAGS+= -D_BOOT
45
46 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
47 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
48 +CFLAGS+= -I/usr/include/libstand
49 CFLAGS+= -I${.CURDIR}/../btx/lib
50 CFLAGS+= -I${.CURDIR}/../libi386
51
52 diff -ur ../src.orig/sys/boot/i386/libi386/Makefile sys/boot/i386/libi386/Makefile
53 --- ../src.orig/sys/boot/i386/libi386/Makefile 2006-04-11 22:11:30.000000000 +0200
54 +++ sys/boot/i386/libi386/Makefile 2008-03-14 11:15:48.506695959 +0100
55 @@ -36,7 +36,7 @@
56 -I${.CURDIR}/../../../contrib/dev/acpica \
57 -I${.CURDIR}/../../.. -I.
58 # the location of libstand
59 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
60 +CFLAGS+= -I/usr/include/libstand/
61
62 .if ${MACHINE_ARCH} == "amd64"
63 CLEANFILES+= machine
64 diff -ur ../src.orig/sys/boot/ia64/common/Makefile sys/boot/ia64/common/Makefile
65 --- ../src.orig/sys/boot/ia64/common/Makefile 2006-11-05 23:03:03.000000000 +0100
66 +++ sys/boot/ia64/common/Makefile 2008-03-14 11:15:48.486695372 +0100
67 @@ -10,7 +10,7 @@
68 CFLAGS+= -I${.CURDIR}/../../efi/include
69 CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
70 CFLAGS+= -I${.CURDIR}/../../..
71 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
72 +CFLAGS+= -I/usr/include/libstand
73
74 .if ${MK_FORTH} != "no"
75 BOOT_FORTH= yes
76 diff -ur ../src.orig/sys/boot/ia64/efi/Makefile sys/boot/ia64/efi/Makefile
77 --- ../src.orig/sys/boot/ia64/efi/Makefile 2006-11-05 23:03:03.000000000 +0100
78 +++ sys/boot/ia64/efi/Makefile 2008-03-14 11:15:48.490695322 +0100
79 @@ -15,7 +15,7 @@
80 CFLAGS+= -I${.CURDIR}/../../efi/include
81 CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH}
82 CFLAGS+= -I${.CURDIR}/../../..
83 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
84 +CFLAGS+= -I/usr/include/libstand
85
86 LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
87 LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic
88 diff -ur ../src.orig/sys/boot/ia64/ski/Makefile sys/boot/ia64/ski/Makefile
89 --- ../src.orig/sys/boot/ia64/ski/Makefile 2006-11-05 23:03:04.000000000 +0100
90 +++ sys/boot/ia64/ski/Makefile 2008-03-14 11:15:48.494695551 +0100
91 @@ -14,7 +14,7 @@
92 CFLAGS+= -I${.CURDIR}/../common
93 CFLAGS+= -I${.CURDIR}/../../common
94 CFLAGS+= -I${.CURDIR}/../../..
95 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
96 +CFLAGS+= -I/usr/include/libstand
97
98 LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH}
99 LDFLAGS= -Wl,-T${LDSCRIPT}
100 diff -ur ../src.orig/sys/boot/ofw/libofw/Makefile sys/boot/ofw/libofw/Makefile
101 --- ../src.orig/sys/boot/ofw/libofw/Makefile 2007-06-17 02:17:15.000000000 +0200
102 +++ sys/boot/ofw/libofw/Makefile 2008-03-14 11:15:48.478695194 +0100
103 @@ -7,7 +7,7 @@
104 ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
105 ofw_time.c openfirm.c
106
107 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
108 +CFLAGS+= -I/usr/include/libstand/
109
110 # Pick up the bootstrap header for some interface items
111 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
112 diff -ur ../src.orig/sys/boot/pc98/libpc98/Makefile sys/boot/pc98/libpc98/Makefile
113 --- ../src.orig/sys/boot/pc98/libpc98/Makefile 2006-04-11 22:11:30.000000000 +0200
114 +++ sys/boot/pc98/libpc98/Makefile 2008-03-14 11:15:48.510696188 +0100
115 @@ -31,6 +31,6 @@
116 -I${.CURDIR}/../../i386/libi386 \
117 -I${.CURDIR}/../../.. -I.
118 # the location of libstand
119 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
120 +CFLAGS+= -I/usr/include/libstand/
121
122 .include <bsd.lib.mk>
123 diff -ur ../src.orig/sys/boot/powerpc/loader/Makefile sys/boot/powerpc/loader/Makefile
124 --- ../src.orig/sys/boot/powerpc/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
125 +++ sys/boot/powerpc/loader/Makefile 2008-03-14 11:15:48.515695706 +0100
126 @@ -82,7 +82,7 @@
127 CFLAGS+= -I${.CURDIR}/../../ofw/libofw
128
129 # where to get libstand from
130 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
131 +CFLAGS+= -I/usr/include/libstand/
132
133 DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
134 LDADD= ${LIBFICL} ${LIBOFW} -lstand
135 diff -ur ../src.orig/sys/boot/sparc64/loader/Makefile sys/boot/sparc64/loader/Makefile
136 --- ../src.orig/sys/boot/sparc64/loader/Makefile 2006-03-17 19:54:36.000000000 +0100
137 +++ sys/boot/sparc64/loader/Makefile 2008-03-14 11:15:48.498695501 +0100
138 @@ -65,7 +65,7 @@
139 CFLAGS+= -I${.CURDIR}/../../ofw/libofw/
140
141 # where to get libstand from
142 -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
143 +CFLAGS+= -I/usr/include/libstand/
144
145 DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND}
146 LDADD= ${LIBFICL} ${LIBOFW} -lstand