Date: Mon, 24 Jun 2019 07:24:28 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505010 - head/ftp/R-cran-curl/files Message-ID: <201906240724.x5O7OSGN043729@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Jun 24 07:24:28 2019 New Revision: 505010 URL: https://svnweb.freebsd.org/changeset/ports/505010 Log: ftp/R-cran-curl: fix build on big-endian architectures BSWAP_32 is undefined on FreeBSD, use bswap32. It also needs sys/endian.h include. Needed because of: /wrkdirs/usr/ports/ftp/R-cran-curl/work/stage/usr/local/lib/R/library/00LOCK-curl/00new/curl/libs/curl.so: Undefined symbol "BSWAP_32" PR: 238704 Approved by: tota (maintainer), tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D20726 Added: head/ftp/R-cran-curl/files/ head/ftp/R-cran-curl/files/patch-src_curl.c (contents, props changed) Added: head/ftp/R-cran-curl/files/patch-src_curl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/R-cran-curl/files/patch-src_curl.c Mon Jun 24 07:24:28 2019 (r505010) @@ -0,0 +1,20 @@ +--- src/curl.c.orig 2019-06-19 09:02:26 UTC ++++ src/curl.c +@@ -24,6 +24,8 @@ + #define BSWAP_32 OSSwapInt32 + #elif (defined(__OpenBSD__)) + #define BSWAP_32(x) swap32(x) ++#elif (defined(__FreeBSD__)) ++#include <sys/endian.h> + #elif (defined(__GLIBC__)) + #include <byteswap.h> + #define BSWAP_32(x) bswap_32(x) +@@ -146,7 +148,7 @@ static size_t rcurl_read(void *target, size_t sz, size + static int rcurl_fgetc(Rconnection con) { + int x = 0; + #ifdef WORDS_BIGENDIAN +- return rcurl_read(&x, 1, 1, con) ? BSWAP_32(x) : R_EOF; ++ return rcurl_read(&x, 1, 1, con) ? bswap32(x) : R_EOF; + #else + return rcurl_read(&x, 1, 1, con) ? x : R_EOF; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906240724.x5O7OSGN043729>