| 1 |
naota 12/03/31 03:56:51 |
| 2 |
|
| 3 |
Added: freebsd-cddl-9.0-libpaths.patch |
| 4 |
Log: |
| 5 |
Add patch to fix libpath for 9.0 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha93/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-cddl/files/freebsd-cddl-9.0-libpaths.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: freebsd-cddl-9.0-libpaths.patch |
| 16 |
=================================================================== |
| 17 |
diff -upNr a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile |
| 18 |
--- a/cddl/lib/libzfs/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 19 |
+++ b/cddl/lib/libzfs/Makefile 2012-03-30 19:04:39.904906253 +0000 |
| 20 |
@@ -54,4 +54,8 @@ CFLAGS+= -I${.CURDIR}/../../../cddl/cont |
| 21 |
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common |
| 22 |
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common |
| 23 |
|
| 24 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 25 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 26 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 27 |
+ |
| 28 |
.include <bsd.lib.mk> |
| 29 |
diff -upNr a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile |
| 30 |
--- a/cddl/lib/libzpool/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 31 |
+++ b/cddl/lib/libzpool/Makefile 2012-03-30 19:04:55.839233753 +0000 |
| 32 |
@@ -56,6 +56,10 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt |
| 33 |
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys |
| 34 |
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include |
| 35 |
|
| 36 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 37 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 38 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 39 |
+ |
| 40 |
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} |
| 41 |
LDADD= -lmd -lpthread -lz -lumem -lnvpair -lavl |
| 42 |
|
| 43 |
diff -upNr a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile |
| 44 |
--- a/cddl/sbin/zfs/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 45 |
+++ b/cddl/sbin/zfs/Makefile 2012-03-30 19:05:11.094859502 +0000 |
| 46 |
@@ -21,6 +21,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 47 |
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys |
| 48 |
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs |
| 49 |
|
| 50 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 51 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 52 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 53 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 54 |
+ |
| 55 |
DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ |
| 56 |
${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 57 |
LDADD= -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 58 |
diff -upNr a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile |
| 59 |
--- a/cddl/sbin/zpool/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 60 |
+++ b/cddl/sbin/zpool/Makefile 2012-03-30 19:05:24.830721002 +0000 |
| 61 |
@@ -26,6 +26,12 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 62 |
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common |
| 63 |
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common |
| 64 |
|
| 65 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 66 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 67 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 68 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 69 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 70 |
+ |
| 71 |
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ |
| 72 |
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} |
| 73 |
LDADD= -lavl -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs |
| 74 |
diff -upNr a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile |
| 75 |
--- a/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 76 |
+++ b/cddl/usr.bin/ctfconvert/Makefile 2012-03-30 19:05:49.454897012 +0000 |
| 77 |
@@ -36,6 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 78 |
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 79 |
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 80 |
|
| 81 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 82 |
+ |
| 83 |
DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 84 |
LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 85 |
|
| 86 |
diff -upNr a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile |
| 87 |
--- a/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 88 |
+++ b/cddl/usr.bin/ctfmerge/Makefile 2012-03-30 19:06:08.084858412 +0000 |
| 89 |
@@ -33,6 +33,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 90 |
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \ |
| 91 |
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common |
| 92 |
|
| 93 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libctf |
| 94 |
+ |
| 95 |
DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD} |
| 96 |
LDADD= -lctf -ldwarf -lelf -lz -lpthread |
| 97 |
|
| 98 |
diff -upNr a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile |
| 99 |
--- a/cddl/usr.bin/zinject/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 100 |
+++ b/cddl/usr.bin/zinject/Makefile 2012-03-30 19:06:25.084865592 +0000 |
| 101 |
@@ -19,6 +19,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 102 |
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 103 |
CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 104 |
|
| 105 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 106 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 107 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 108 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 109 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 110 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 111 |
+ |
| 112 |
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ |
| 113 |
${LIBZFS} ${LIBZPOOL} |
| 114 |
LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool |
| 115 |
diff -upNr a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile |
| 116 |
--- a/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 117 |
+++ b/cddl/usr.bin/zstreamdump/Makefile 2012-03-30 19:06:44.544860132 +0000 |
| 118 |
@@ -18,6 +18,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 119 |
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 120 |
CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 121 |
|
| 122 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 123 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 124 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 125 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 126 |
+ |
| 127 |
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 128 |
${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 129 |
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 130 |
diff -upNr a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile |
| 131 |
--- a/cddl/usr.bin/ztest/Makefile 2012-03-30 18:58:53.174771000 +0000 |
| 132 |
+++ b/cddl/usr.bin/ztest/Makefile 2012-03-30 19:06:58.344895642 +0000 |
| 133 |
@@ -17,6 +17,11 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 134 |
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head |
| 135 |
CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 136 |
|
| 137 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 138 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 139 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 140 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 141 |
+ |
| 142 |
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ |
| 143 |
${LIBPTHREAD} ${LIBZ} ${LIBAVL} |
| 144 |
LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl |
| 145 |
diff -upNr a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile |
| 146 |
--- a/cddl/usr.sbin/zdb/Makefile 2012-03-30 18:58:53.164736000 +0000 |
| 147 |
+++ b/cddl/usr.sbin/zdb/Makefile 2012-03-30 19:07:17.454861002 +0000 |
| 148 |
@@ -23,6 +23,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ |
| 149 |
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head |
| 150 |
CFLAGS+= -I${.CURDIR}/../../lib/libumem |
| 151 |
|
| 152 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libavl |
| 153 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libnvpair |
| 154 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libumem |
| 155 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libuutil |
| 156 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzfs |
| 157 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libzpool |
| 158 |
+ |
| 159 |
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ |
| 160 |
${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} |
| 161 |
LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool |
| 162 |
--- a/cddl/usr.sbin/dtrace/Makefile.old 2011-07-06 00:09:01.000000000 +0000 |
| 163 |
+++ b/cddl/usr.sbin/dtrace/Makefile 2011-07-06 00:09:48.000000000 +0000 |
| 164 |
@@ -24,6 +24,8 @@ |
| 165 |
#CFLAGS+= -DNEED_ERRLOC |
| 166 |
#YFLAGS+= -d |
| 167 |
|
| 168 |
+LDFLAGS+= -L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 169 |
+ |
| 170 |
DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
| 171 |
${LIBCTF} ${LIBELF} ${LIBZ} ${LIBUTIL} ${LIBRTLD_DB} |
| 172 |
LDADD= -lpthread -ldtrace -ly -lfl -lproc -lctf -lelf -lz -lutil \ |
| 173 |
--- a/cddl/usr.sbin/lockstat/Makefile.old 2011-07-06 00:10:33.000000000 +0000 |
| 174 |
+++ b/cddl/usr.sbin/lockstat/Makefile 2011-07-06 00:10:57.000000000 +0000 |
| 175 |
@@ -23,6 +23,8 @@ |
| 176 |
|
| 177 |
CFLAGS+= -DNEED_ERRLOC -g |
| 178 |
|
| 179 |
+LDFLAGS+=-L${.CURDIR}/../../lib/libdtrace -L${.CURDIR}/../../lib/libctf |
| 180 |
+ |
| 181 |
#YFLAGS+= -d |
| 182 |
|
| 183 |
DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} \ |
Archives