Date: Tue, 29 Dec 2015 15:05:44 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404749 - head/biology/htslib/files Message-ID: <201512291505.tBTF5i8F068604@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Tue Dec 29 15:05:44 2015 New Revision: 404749 URL: https://svnweb.freebsd.org/changeset/ports/404749 Log: biology/htslib: Replace FreeBSD-specific fix with a generic one This port will not build if ENOTRECOVERABLE is not defined, period. It's not necessary to check OPSYS and version, just apply the fallback definition if it's not defined. This unbreaks DragonFly after last commit. Modified: head/biology/htslib/files/patch-hfile__libcurl.c Modified: head/biology/htslib/files/patch-hfile__libcurl.c ============================================================================== --- head/biology/htslib/files/patch-hfile__libcurl.c Tue Dec 29 14:55:30 2015 (r404748) +++ head/biology/htslib/files/patch-hfile__libcurl.c Tue Dec 29 15:05:44 2015 (r404749) @@ -1,12 +1,11 @@ ---- hfile_libcurl.c.orig 2015-12-22 22:35:42 UTC +--- hfile_libcurl.c.orig 2015-12-15 16:34:33 UTC +++ hfile_libcurl.c -@@ -39,6 +39,11 @@ DEALINGS IN THE SOFTWARE. */ +@@ -39,6 +39,10 @@ DEALINGS IN THE SOFTWARE. */ #include <curl/curl.h> -+#include <sys/param.h> -+#if defined(__FreeBSD__) && (__FreeBSD_version < 1000033) && !defined(ENOTRECOVERABLE) -+# define ENOTRECOVERABLE EIO ++#ifndef ENOTRECOVERABLE ++#define ENOTRECOVERABLE EIO +#endif + typedef struct {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512291505.tBTF5i8F068604>