Gentoo Archives: gentoo-commits

From: Yuta SATOH <nigoro.gentoo@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/files/
Date: Fri, 30 Aug 2013 18:30:28
Message-Id: 1377867738.5803a3bcc36b65b064d426eb16c534b2019c3a12.yuta_satoh@gentoo
1 commit: 5803a3bcc36b65b064d426eb16c534b2019c3a12
2 Author: Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
3 AuthorDate: Fri Aug 30 13:02:18 2013 +0000
4 Commit: Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
5 CommitDate: Fri Aug 30 13:02:18 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5803a3bc
7
8 freebsd-lib-9999_p255023: multiple fix
9
10 added freebsd-lib-9999-liblink.patch
11 removed freebsd-lib-9.0-netware.patch
12 added WITHOUT_ATF=, build fails
13 added WITHOUT_LDNS=, unbound related file.
14 added WITHOUT_ICONV=, G/FBSD has dev-libs/libiconv
15 added fix file collisions, /usr/include/iconv.h ... workaround fix ATM. better use freebsd-lib's iconv?
16
17 ---
18 .../files/freebsd-lib-9999-liblink.patch | 83 ++++++++++++++++++++++
19 1 file changed, 83 insertions(+)
20
21 diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-liblink.patch
22 new file mode 100644
23 index 0000000..6e7ebdd
24 --- /dev/null
25 +++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9999-liblink.patch
26 @@ -0,0 +1,83 @@
27 +diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
28 +index 9a21dde..0815f0a 100644
29 +--- a/lib/libcam/Makefile
30 ++++ b/lib/libcam/Makefile
31 +@@ -8,6 +8,7 @@ INCS= camlib.h
32 +
33 + DPADD= ${LIBSBUF}
34 + LDADD= -lsbuf
35 ++LDFLAGS+= -L${.OBJDIR}/../libsbuf
36 +
37 + MAN= cam.3 cam_cdbparse.3
38 +
39 +diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
40 +index dbd7895..607b1f6 100644
41 +--- a/lib/libdwarf/Makefile
42 ++++ b/lib/libdwarf/Makefile
43 +@@ -21,6 +21,7 @@ SRCS= \
44 + INCS= dwarf.h libdwarf.h
45 +
46 + CFLAGS+= -I${.CURDIR}
47 ++CFLAGS+= -I${.CURDIR}/../libelf
48 +
49 + SHLIB_MAJOR= 3
50 +
51 +diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
52 +index 4449c06..f024cf0 100644
53 +--- a/lib/libproc/Makefile
54 ++++ b/lib/libproc/Makefile
55 +@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \
56 + INCS= libproc.h
57 +
58 + CFLAGS+= -I${.CURDIR}
59 ++CFLAGS+= -I${.CURDIR}/../libelf
60 +
61 + .if ${MK_LIBCPLUSPLUS} != "no"
62 + LDADD+= -lcxxrt
63 +@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2
64 +
65 + WITHOUT_MAN=
66 +
67 ++LDADD+= -lelf
68 ++LDFLAGS+= -L${.OBJDIR}/../libelf
69 ++
70 + .include <bsd.lib.mk>
71 +diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
72 +index af5a775..c01aa05 100644
73 +--- a/lib/libprocstat/Makefile
74 ++++ b/lib/libprocstat/Makefile
75 +@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def
76 + SYMBOL_MAPS= ${.CURDIR}/Symbol.map
77 +
78 + INCS= libprocstat.h
79 ++CFLAGS+= -I${.CURDIR}/../libelf
80 ++LDFLAGS+= -L${.OBJDIR}/../libelf
81 + CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
82 + SHLIB_MAJOR= 1
83 +
84 +diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
85 +index 2815a07..e992662 100644
86 +--- a/lib/librtld_db/Makefile
87 ++++ b/lib/librtld_db/Makefile
88 +@@ -10,5 +10,8 @@ SRCS= rtld_db.c
89 + INCS= rtld_db.h
90 +
91 + CFLAGS+= -I${.CURDIR}
92 ++CFLAGS+= -I${.CURDIR}/../libelf
93 ++LDADD+= -lutil -lproc
94 ++LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
95 +
96 + .include <bsd.lib.mk>
97 +diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
98 +index 1cf52a0..3d25fae 100644
99 +--- a/lib/libtelnet/Makefile
100 ++++ b/lib/libtelnet/Makefile
101 +@@ -13,6 +13,8 @@ INTERNALLIB=
102 + SRCS= genget.c getent.c misc.c
103 + CFLAGS+= -I${TELNETDIR}
104 +
105 ++CFLAGS+= -I${.CURDIR}/../libmp
106 ++
107 + WARNS?= 2
108 +
109 + .if !defined(RELEASE_CRUNCH)