Hi,

so libev previously needed a hack to build on arm (and sparc).
"SMP" support was disabled to avoid the need for sync assembly
instructions.  Now that cc advertize support for __ARM_ARCH_6K__ we can
use the mcr instruction, and don't need any hack.

cubox /tmp$ cc -E -dM - < /dev/null  | grep ARM
#define __ARMEL__ 1
#define __ARM_ARCH_6K__ 1
#define __ARM_EABI__ 1

With the patches below, the various libev ports still work fine on my
cubox.

ok?


Index: devel/libev/Makefile
===================================================================
RCS file: /d/cvs/ports/devel/libev/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- devel/libev/Makefile        16 Jan 2017 08:55:41 -0000      1.21
+++ devel/libev/Makefile        19 Feb 2017 09:52:28 -0000
@@ -3,6 +3,7 @@
 COMMENT =      high-performance event loop library
 
 DISTNAME =     libev-4.24
+REVISION =     0
 CATEGORIES =   devel
 
 MAINTAINER =   David Coppa <dco...@openbsd.org>
@@ -19,9 +20,5 @@ PERMIT_PACKAGE_CDROM =        Yes
 WANTLIB =              m
 
 CONFIGURE_STYLE =      gnu
-
-.if ${MACHINE_ARCH} == "arm"
-CFLAGS +=      -DEV_NO_SMP
-.endif
 
 .include <bsd.port.mk>
Index: devel/p5-EV/Makefile
===================================================================
RCS file: /d/cvs/ports/devel/p5-EV/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- devel/p5-EV/Makefile        1 Sep 2016 10:53:26 -0000       1.16
+++ devel/p5-EV/Makefile        19 Feb 2017 09:54:57 -0000
@@ -4,6 +4,7 @@ COMMENT =       perl interface to libev
 
 MODULES =      cpan
 DISTNAME =     EV-4.22
+REVISION =     0
 CATEGORIES =   devel
 CPAN_AUTHOR =  MLEHMANN
 
@@ -16,9 +17,5 @@ BUILD_DEPENDS =               ${RUN_DEPENDS}
 RUN_DEPENDS =          devel/libev \
                        devel/p5-common-sense \
                        devel/p5-Canary-Stability
-
-.if ${MACHINE_ARCH} == "arm"
-CONFIGURE_ENV +=       EV_EXTRA_DEFS="-DEV_NO_SMP"
-.endif
 
 .include <bsd.port.mk>
Index: x11/rxvt-unicode/Makefile
===================================================================
RCS file: /d/cvs/ports/x11/rxvt-unicode/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- x11/rxvt-unicode/Makefile   1 Sep 2016 10:53:27 -0000       1.38
+++ x11/rxvt-unicode/Makefile   19 Feb 2017 09:55:35 -0000
@@ -3,7 +3,7 @@
 COMMENT =      clone of rxvt with Unicode and Xft support
 
 DISTNAME =     rxvt-unicode-9.22
-REVISION =     2
+REVISION =     3
 CATEGORIES =   x11
 
 EXTRACT_SUFX = .tar.bz2
@@ -38,9 +38,5 @@ CONFIGURE_ARGS =      --enable-256-color \
                        --enable-wtmp
 CONFIGURE_ENV +=       CPPFLAGS="-I${X11BASE}/include" \
                        pt_cv_tty_group=yes
-
-.if ${MACHINE_ARCH} == "arm"
-CXXFLAGS +=    -DEV_NO_SMP
-.endif
 
 .include <bsd.port.mk>


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to