mgorny 15/03/08 14:01:56
Added: freebsd-lib-10.0-libusb.patch
freebsd-lib-10.0-liblink.patch
freebsd-lib-10.0-libproc-libcxx.patch
freebsd-lib-10.1-cve-2014-8611.patch
freebsd-lib-10.0-atfcxx.patch
Log:
Add FreeBSD 10.1 ebuilds,
https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/46 by nigoro.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.1 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch?rev=1.1&content-type=text/plain
Index: freebsd-lib-10.0-libusb.patch
===================================================================
diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile
index 21016a9..26010e8 100644
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
@@ -40,11 +40,11 @@ CFLAGS+= -DCOMPAT_32BIT
beforeinstall:
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+ ${.CURDIR}/libusb-0.1.pc ${DESTDIR}${LIBDIR}/pkgconfig
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+ ${.CURDIR}/libusb-1.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+ ${.CURDIR}/libusb-2.0.pc ${DESTDIR}${LIBDIR}/pkgconfig
#
# Cross platform support
1.1
sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-liblink.patch?rev=1.1&content-type=text/plain
Index: freebsd-lib-10.0-liblink.patch
===================================================================
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 9a21dde..0815f0a 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -8,6 +8,7 @@ INCS= camlib.h
DPADD= ${LIBSBUF}
LDADD= -lsbuf
+LDFLAGS+= -L${.OBJDIR}/../libsbuf
MAN= cam.3 cam_cdbparse.3
diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index dbd7895..607b1f6 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -21,6 +21,7 @@ SRCS= \
INCS= dwarf.h libdwarf.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
SHLIB_MAJOR= 3
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 4449c06..f024cf0 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -14,6 +14,7 @@ SRCS= proc_bkpt.c \
INCS= libproc.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
.if ${MK_LIBCPLUSPLUS} != "no"
LDADD+= -lcxxrt
@@ -27,4 +28,7 @@ SHLIB_MAJOR= 2
WITHOUT_MAN=
+LDADD+= -lelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
+
.include <bsd.lib.mk>
diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
index af5a775..c01aa05 100644
--- a/lib/libprocstat/Makefile
+++ b/lib/libprocstat/Makefile
@@ -16,6 +16,8 @@ VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
INCS= libprocstat.h
+CFLAGS+= -I${.CURDIR}/../libelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE
SHLIB_MAJOR= 1
diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile
index 2815a07..e992662 100644
--- a/lib/librtld_db/Makefile
+++ b/lib/librtld_db/Makefile
@@ -10,5 +10,8 @@ SRCS= rtld_db.c
INCS= rtld_db.h
CFLAGS+= -I${.CURDIR}
+CFLAGS+= -I${.CURDIR}/../libelf
+LDADD+= -lutil -lproc
+LDFLAGS+= -L${.OBJDIR}/../libutil -L${.OBJDIR}/../libproc
.include <bsd.lib.mk>
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1cf52a0..3d25fae 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -13,6 +13,8 @@ INTERNALLIB=
SRCS= genget.c getent.c misc.c
CFLAGS+= -I${TELNETDIR}
+CFLAGS+= -I${.CURDIR}/../libmp
+
WARNS?= 2
.if !defined(RELEASE_CRUNCH)
diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile
index 30a1dfb..9f8a99c 100644
--- a/lib/libexecinfo/Makefile
+++ b/lib/libexecinfo/Makefile
@@ -10,8 +10,10 @@ SHLIB_MAJOR= 1
INCS= execinfo.h
SRCS= backtrace.c symtab.c unwind.c
+CFLAGS+= -I${.CURDIR}/../libelf
DPADD= ${LIBELF}
LDADD= -lelf
+LDFLAGS+= -L${.OBJDIR}/../libelf
MAN= backtrace.3
1.1
sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libproc-libcxx.patch?rev=1.1&content-type=text/plain
Index: freebsd-lib-10.0-libproc-libcxx.patch
===================================================================
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index f9e01ab..15b27d8 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -15,7 +15,10 @@ INCS= libproc.h
CFLAGS+= -I${.CURDIR}
-.if ${MK_LIBCPLUSPLUS} != "no"
+.if ${CXX:T:M*-stdlib=libc++*}
+LDADD+= -lcxxrt
+DPADD+= ${LIBCXXRT}
+.elif ${CXXFLAGS:T:M*-stdlib=libc++*}
LDADD+= -lcxxrt
DPADD+= ${LIBCXXRT}
.else
1.1
sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.1-cve-2014-8611.patch?rev=1.1&content-type=text/plain
Index: freebsd-lib-10.1-cve-2014-8611.patch
===================================================================
Index: lib/libc/stdio/fflush.c
===================================================================
--- lib/libc/stdio/fflush.c.orig
+++ lib/libc/stdio/fflush.c
@@ -124,11 +124,13 @@
t = _swrite(fp, (char *)p, n);
if (t <= 0) {
/* Reset _p and _w. */
- if (p > fp->_p) /* Some was written. */
+ if (p > fp->_p) {
+ /* Some was written. */
memmove(fp->_p, p, n);
- fp->_p += n;
- if ((fp->_flags & (__SLBF | __SNBF)) == 0)
- fp->_w -= n;
+ fp->_p += n;
+ if ((fp->_flags & (__SLBF | __SNBF)) == 0)
+ fp->_w -= n;
+ }
fp->_flags |= __SERR;
return (EOF);
}
1.1 sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-atfcxx.patch?rev=1.1&content-type=text/plain
Index: freebsd-lib-10.0-atfcxx.patch
===================================================================
diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
index 937187a..d5277f3 100644
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -49,6 +49,24 @@ CFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"'
CFLAGS+= -DATF_SHELL='"/bin/sh"'
CFLAGS+= -DATF_WORKDIR='"/tmp"'
+CXXFLAGS+= -DHAVE_CONFIG_H
+CXXFLAGS+= -DATF_ARCH='"${MACHINE}"'
+CXXFLAGS+= -DATF_BUILD_CC='"${CC}"'
+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
+CXXFLAGS+= -DATF_BUILD_CPP='"${CPP}"'
+CXXFLAGS+= -DATF_BUILD_CPPFLAGS='"${_CPPFLAGS}"'
+CXXFLAGS+= -DATF_BUILD_CXX='"${CXX}"'
+CXXFLAGS+= -DATF_BUILD_CXXFLAGS='"${_CXXFLAGS}"'
+CXXFLAGS+= -DATF_CONFDIR='"${CONFDIR}/atf"'
+CXXFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"'
+CXXFLAGS+= -DATF_LIBDIR='"${LIBDIR}"'
+CXXFLAGS+= -DATF_LIBEXECDIR='"${LIBEXECDIR}"'
+CXXFLAGS+= -DATF_MACHINE='"${MACHINE_ARCH}"'
+CXXFLAGS+= -DATF_M4='"/usr/bin/m4"'
+CXXFLAGS+= -DATF_PKGDATADIR='"${SHAREDIR}/atf"'
+CXXFLAGS+= -DATF_SHELL='"/bin/sh"'
+CXXFLAGS+= -DATF_WORKDIR='"/tmp"'
+
WARNS?= 3
# vim: syntax=make
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 37d6073..90a2687 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -40,11 +40,11 @@ LDFLAGS+= -L${.OBJDIR}/../libatf-c
.PATH: ${ATF}/atf-c++
.PATH: ${ATF}/atf-c++/detail
-CFLAGS+= -I${ATF}
-CFLAGS+= -I${.CURDIR}/../libatf-c
-CFLAGS+= -I.
+CXXFLAGS+= -I${ATF}
+CXXFLAGS+= -I${.CURDIR}/../libatf-c
+CXXFLAGS+= -I.
-CFLAGS+= -DHAVE_CONFIG_H
+CXXFLAGS+= -DHAVE_CONFIG_H
SRCS= application.cpp \
build.cpp \
