Skip to content

Commit

Permalink
math/cado-nfs: fix build on non-amd64
Browse files Browse the repository at this point in the history
lingen_pz is installed only on amd64.

While here, rework endianness detection, since the current method uses plain
list of architectures. Since powerpc64le is little endian and POWER as whole
is set up in cado-endian.h as big-endian, it will result in runtime issues.
  • Loading branch information
pkubaj committed Oct 12, 2021
1 parent 06f9c78 commit 5340461
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 2 deletions.
9 changes: 8 additions & 1 deletion math/cado-nfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ COMMENT= Implementation of the Number Field Sieve Algorithm
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING

BROKEN_i386= pkg-static: Unable to access file /wrkdirs/usr/ports/math/cado-nfs/work/stage/usr/local/lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz:No such file or directory
CONFLICTS_BUILD= libfmt # bundled libfmt conflicts with package-installed headers

BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
Expand All @@ -33,4 +32,12 @@ TEST_TARGET= check # 'test' does the same but is less verbose

BINARY_ALIAS= python3=${PYTHON_CMD} make=${GMAKE}

.include <bsd.port.options.mk>

.if ${ARCH} == amd64
PLIST_SUB= LINGEN_PZ=""
.else
PLIST_SUB= LINGEN_PZ="@comment "
.endif

.include <bsd.port.mk>
53 changes: 53 additions & 0 deletions math/cado-nfs/files/patch-utils_cado-endian.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
--- utils/cado-endian.h.orig 2021-09-16 01:25:08 UTC
+++ utils/cado-endian.h
@@ -27,20 +27,16 @@

// pragma no prototypes

-#ifdef HAVE_GLIBC
-// GNU libc offers the helpful header <endian.h> which defines
-// __BYTE_ORDER
-# include <endian.h>
-# if (__BYTE_ORDER == __LITTLE_ENDIAN)
+# if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
# define CADO_LITTLE_ENDIAN
-# elif (__BYTE_ORDER == __BIG_ENDIAN)
+# elif (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
# define CADO_BIG_ENDIAN
-# elif (__BYTE_ORDER == __PDP_ENDIAN)
+# elif (__BYTE_ORDER__ == __PDP_ENDIAN)
# define CADO_PDP_ENDIAN
# else
# error Unknown machine endianness detected.
# endif
-# define CADO_BYTE_ORDER __BYTE_ORDER
+# define CADO_BYTE_ORDER __BYTE_ORDER__
/* There is no serious reason to think that _BIG_ENDIAN or _LITTLE_ENDIAN
* being defined actually means that the machine is big (resp, little)
* endian. Systems may like to unconditionally define these as constants
@@ -54,25 +50,4 @@
# define CADO_LITTLE_ENDIAN
# define CADO_BYTE_ORDER 1234
*/
-#elif defined(__sparc) || defined(__sparc__) \
- || defined(_POWER) || defined(__powerpc__) \
- || defined(__ppc__) || defined(__hpux) \
- || defined(_MIPSEB) || defined(_POWER) \
- || defined(__AARCH64EB__) \
- || defined(__s390__)
-# define CADO_BIG_ENDIAN
-# define CADO_BYTE_ORDER 4321
-#elif defined(__i386__) || defined(__alpha__) \
- || defined(__ia64) || defined(__ia64__) \
- || defined(_M_IX86) || defined(_M_IA64) \
- || defined(_M_ALPHA) || defined(__amd64) \
- || defined(__amd64__) || defined(_M_AMD64) \
- || defined(__x86_64) || defined(__x86_64__) \
- || defined(__AARCH64EL__) \
- || defined(_M_X64)
-# define CADO_LITTLE_ENDIAN
-# define CADO_BYTE_ORDER 1234
-#else
-# error The file cado-endian.h needs to be set up for your CPU type.
-#endif
#endif
2 changes: 1 addition & 1 deletion math/cado-nfs/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ lib/cado-nfs-3.0.0/linalg/bwc/cleanup
lib/cado-nfs-3.0.0/linalg/bwc/dispatch
lib/cado-nfs-3.0.0/linalg/bwc/gather
lib/cado-nfs-3.0.0/linalg/bwc/krylov
lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz
%%LINGEN_PZ%%lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz
lib/cado-nfs-3.0.0/linalg/bwc/lingen_u64k1
lib/cado-nfs-3.0.0/linalg/bwc/mf_bal
lib/cado-nfs-3.0.0/linalg/bwc/mksol
Expand Down

0 comments on commit 5340461

Please sign in to comment.