audio/umurmur doesn't build on LP64 archs that aren't amd64:

cc -DHAVE_CONFIG_H -I. -I..    -I/usr/local/include  -O2 -pipe -MT crypt.o -MD 
-MP -MF .deps/crypt.Tpo -c -o crypt.o crypt.c
crypt.c:228:22: error: byteswap.h: No such file or directory

Here's a fix to skip the Linuxism.
While here, remove the mistaken NO_TEST.

ok?

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/umurmur/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile    6 Jun 2014 09:08:37 -0000       1.11
+++ Makefile    25 Jul 2014 21:09:57 -0000
@@ -26,8 +26,6 @@ CONFIGURE_ENV =               CPPFLAGS="-I${LOCALBASE
                        LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS =       --with-ssl=openssl
 
-NO_TEST =              Yes
-
 post-configure:
        ${SUBST_CMD} ${WRKSRC}/src/conf.c ${WRKSRC}/src/conf.h
 
Index: patches/patch-src_crypt_c
===================================================================
RCS file: /cvs/ports/audio/umurmur/patches/patch-src_crypt_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_crypt_c
--- patches/patch-src_crypt_c   6 Jun 2014 09:08:37 -0000       1.4
+++ patches/patch-src_crypt_c   25 Jul 2014 21:09:57 -0000
@@ -7,8 +7,8 @@ voice running over TCP only when umurmur
 Adapted from upstream git commit 27da14ea2abe5680ddfcffbf2a59be5f5a67cecd
 
 --- src/crypt.c.orig   Wed Jan  1 22:40:30 2014
-+++ src/crypt.c        Fri Jun  6 10:39:52 2014
-@@ -220,16 +220,14 @@ bool_t CryptState_decrypt(cryptState_t *cs, const unsi
++++ src/crypt.c        Fri Jul 25 23:01:45 2014
+@@ -220,16 +220,16 @@ bool_t CryptState_decrypt(cryptState_t *cs, const unsi
  #define SHIFTBITS 63
  typedef uint64_t subblock;
  
@@ -19,11 +19,14 @@ Adapted from upstream git commit 27da14e
 -#ifdef __x86_64__
 +#elif defined( __x86_64__)
  #define SWAPPED(x) ({register uint64_t __out, __in = (x); __asm__("bswap %q0" 
: "=r"(__out) : "0"(__in)); __out;})
- #else
+-#else
++#elif defined(LINUX)
  #include <byteswap.h>
  #define SWAPPED(x) bswap_64(x)
 -#endif
 -#endif
++#else
++#define SWAPPED(x) htobe64(x)
 +#endif // defined(BYTE_ORDER_BIG_ENDIAN)
  
  #else
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to