diff options
| author |   Markus Duft <mduft@gentoo.org> | 2008-07-21 09:05:10 +0000 |
|---|---|---|
| committer | Markus Duft <mduft@gentoo.org> | 2008-07-21 09:05:10 +0000 |
| commit | 7cee7d6f682277545708af95409d1319125b886c (patch) | |
| tree | 24ea04031fc52319e7f712fd9cd404ef844694d2 /sys-apps/man | |
| parent | ohhh. come on. duplicate src_unpack (diff) | |
| download | prefix-7cee7d6f682277545708af95409d1319125b886c.tar.gz prefix-7cee7d6f682277545708af95409d1319125b886c.tar.bz2 prefix-7cee7d6f682277545708af95409d1319125b886c.zip | |
fixed for interix with _ALL_SOURCE
(Portage version: 2.2.00.11125-prefix/svn/Interix 3.5 x86)
Diffstat (limited to 'sys-apps/man')
| -rw-r--r-- | sys-apps/man/files/man-1.6f-interix-all_source.patch | 12 | ||||
| -rw-r--r-- | sys-apps/man/man-1.6f-r2.ebuild | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sys-apps/man/files/man-1.6f-interix-all_source.patch b/sys-apps/man/files/man-1.6f-interix-all_source.patch new file mode 100644 index 0000000000..2b75b4c372 --- /dev/null +++ b/sys-apps/man/files/man-1.6f-interix-all_source.patch @@ -0,0 +1,12 @@ +diff -ru man-1.6f.orig/gencat/genlib.c man-1.6f/gencat/genlib.c +--- man-1.6f.orig/gencat/genlib.c 2008-07-21 10:53:16 +0200 ++++ man-1.6f/gencat/genlib.c 2008-07-21 10:55:18 +0200 +@@ -52,7 +52,7 @@ + #include <sys/types.h> + #include <unistd.h> + +-#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) ++#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__APPLE__) && !defined(__NetBSD__) && !( defined(__INTERIX) && defined(_ALL_SOURCE)) + #include <memory.h> + static int bcopy(src, dst, length) + char *src, *dst; diff --git a/sys-apps/man/man-1.6f-r2.ebuild b/sys-apps/man/man-1.6f-r2.ebuild index e83247157b..c44e630fb9 100644 --- a/sys-apps/man/man-1.6f-r2.ebuild +++ b/sys-apps/man/man-1.6f-r2.ebuild @@ -72,6 +72,10 @@ src_unpack() { epatch "${FILESDIR}"/man-1.6f-echo.patch eprefixify "${S}"/src/man.c + # don't use built-in versions of bcopy and bzero if _ALL_SOURCE is deinfed + # on interix, since they have conflicting definitions with system headers. + epatch "${FILESDIR}"/${P}-interix-all_source.patch + strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ }) if use prefix ; then |