summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com>2017-02-10 17:53:21 +0100
committerDavid Seifert <soap@gentoo.org>2017-02-11 21:14:04 +0100
commit978bfa02cc3c1d14d32cbebd9a1b300b334ffca3 (patch)
treea2bddc60b249c4efdbea1eacafd296d777d05809
parentsys-freebsd/freebsd-cddl: remove unused patch (diff)
downloadgentoo-978bfa02cc3c1d14d32cbebd9a1b300b334ffca3.tar.gz
gentoo-978bfa02cc3c1d14d32cbebd9a1b300b334ffca3.tar.bz2
gentoo-978bfa02cc3c1d14d32cbebd9a1b300b334ffca3.zip
sys-freebsd/freebsd-lib: remove unused patches/file
Closes: https://github.com/gentoo/gentoo/pull/3903
-rw-r--r--sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch19
-rw-r--r--sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch62
-rw-r--r--sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch13
-rw-r--r--sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch68
-rw-r--r--sys-freebsd/freebsd-lib/files/libmap.conf8
5 files changed, 0 insertions, 170 deletions
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
deleted file mode 100644
index 296825259f08..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-10.0-libusb.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch
deleted file mode 100644
index da495e48ebf1..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-11.0-liblink.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
-index 2dedf11..275f4c3 100644
---- a/lib/libproc/Makefile
-+++ b/lib/libproc/Makefile
-@@ -15,6 +15,7 @@ SRCS= proc_bkpt.c \
- INCS= libproc.h
-
- CFLAGS+= -I${.CURDIR}
-+CFLAGS+= -I${.CURDIR}/../libelf
-
- .if ${MK_CXX} == "no"
- CFLAGS+= -DNO_CXA_DEMANGLE
-@@ -28,6 +29,9 @@ LIBADD+= elf rtld_db util
-
- .if ${MK_CDDL} != "no"
- LIBADD+= ctf
-+LDADD+= -lelf
-+LDFLAGS+= -L${.OBJDIR}/../libelf
-+
- IGNORE_PRAGMA= YES
- CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
- -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
-diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile
-index 1829883..d0065a3 100644
---- a/lib/libprocstat/Makefile
-+++ b/lib/libprocstat/Makefile
-@@ -17,6 +17,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 0a8ed95..11baf5b 100644
---- a/lib/librtld_db/Makefile
-+++ b/lib/librtld_db/Makefile
-@@ -11,6 +11,9 @@ 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
- # Avoid circular dependency, we only need the libproc.h header here.
- CFLAGS+= -I${.CURDIR:H}/libproc
-
-diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
-index f84aee3..c36ade9 100644
---- a/lib/libtelnet/Makefile
-+++ b/lib/libtelnet/Makefile
-@@ -14,6 +14,8 @@ INTERNALLIB=
- SRCS= genget.c getent.c misc.c
- CFLAGS+= -I${TELNETDIR}
-
-+CFLAGS+= -I${.CURDIR}/../libmp
-+
- WARNS?= 2
-
- .if ${MK_OPENSSL} != "no"
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
deleted file mode 100644
index ec90defc03a0..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-bsdxml.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u lib/libgeom/Makefile lib.xml/libgeom/Makefile
---- lib/libgeom/Makefile 2004-03-07 16:07:57 +0000
-+++ lib.xml/libgeom/Makefile 2005-05-06 10:38:41 +0000
-@@ -8,7 +8,8 @@
- SRCS+= geom_ctl.c
- INCS= libgeom.h
-
--CFLAGS += -I${.CURDIR}
-+CFLAGS += -I${.CURDIR} -I${.CURDIR}/../libexpat
-+LDFLAGS += -L${.CURDIR}/../libexpat
-
- WARNS?= 3
-
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
deleted file mode 100644
index c9288a45c61f..000000000000
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-new_as.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- lib/msun/i387/fenv.c.orig 2007-01-05 04:15:26 -0300
-+++ lib/msun/i387/fenv.c 2008-06-14 00:49:30 -0300
-@@ -152,7 +152,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
-- int mxcsr, status;
-+ int mxcsr;
-+ short status;
-
- __fnstsw(&status);
- if (__HAS_SSE())
---- lib/msun/i387/fenv.h.orig 2007-01-06 18:46:23 -0300
-+++ lib/msun/i387/fenv.h 2008-06-14 01:06:40 -0300
-@@ -134,7 +134,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
-- int __mxcsr, __status;
-+ int __mxcsr;
-+ short __status;
-
- __fnstsw(&__status);
- if (__HAS_SSE())
-@@ -151,7 +152,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
-- int __mxcsr, __status;
-+ int __mxcsr;
-+ short __status;
-
- __fnstsw(&__status);
- if (__HAS_SSE())
---- lib/msun/amd64/fenv.c.orig 2007-01-05 04:15:26 -0300
-+++ lib/msun/amd64/fenv.c 2008-06-14 01:02:41 -0300
-@@ -101,7 +101,8 @@
- int
- feupdateenv(const fenv_t *envp)
- {
-- int mxcsr, status;
-+ int mxcsr;
-+ short status;
-
- __fnstsw(&status);
- __stmxcsr(&mxcsr);
---- lib/msun/amd64/fenv.h.orig 2007-01-06 18:46:23 -0300
-+++ lib/msun/amd64/fenv.h 2008-06-14 01:08:23 -0300
-@@ -110,7 +110,8 @@
- static __inline int
- fegetexceptflag(fexcept_t *__flagp, int __excepts)
- {
-- int __mxcsr, __status;
-+ int __mxcsr;
-+ short __status;
-
- __stmxcsr(&__mxcsr);
- __fnstsw(&__status);
-@@ -124,7 +125,8 @@
- static __inline int
- fetestexcept(int __excepts)
- {
-- int __mxcsr, __status;
-+ int __mxcsr;
-+ short __status;
-
- __stmxcsr(&__mxcsr);
- __fnstsw(&__status);
diff --git a/sys-freebsd/freebsd-lib/files/libmap.conf b/sys-freebsd/freebsd-lib/files/libmap.conf
deleted file mode 100644
index 7a879f973788..000000000000
--- a/sys-freebsd/freebsd-lib/files/libmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/libmap.conf
-
-# Ensure that libthr does all threading
-libpthread.so.2 libthr.so.2
-libpthread.so libthr.so
-libc_r.so.6 libthr.so.2
-libc_r.so libthr.so
-