Thu Nov 20 15:24:57 2014 UTC ()
Really match all ARM variants.


(joerg)
diff -r1.92 -r1.93 pkgsrc/lang/ocaml/Makefile
cvs diff -r1.92 -r1.93 pkgsrc/lang/ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/ocaml/Makefile 2014/11/20 15:22:44 1.92
+++ pkgsrc/lang/ocaml/Makefile 2014/11/20 15:24:57 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.92 2014/11/20 15:22:44 joerg Exp $ 1# $NetBSD: Makefile,v 1.93 2014/11/20 15:24:57 joerg Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5#CONFIGURE_ARGS+= -no-tk 5#CONFIGURE_ARGS+= -no-tk
6CONFIGURE_ARGS+= -cc ${CC} 6CONFIGURE_ARGS+= -cc ${CC}
7CONFIGURE_ENV+= disable_x11=yes 7CONFIGURE_ENV+= disable_x11=yes
8 8
9BUILD_TARGET= world 9BUILD_TARGET= world
10MAKE_JOBS_SAFE= no 10MAKE_JOBS_SAFE= no
11UNLIMIT_RESOURCES= stacksize 11UNLIMIT_RESOURCES= stacksize
12 12
13USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
14 14
@@ -18,27 +18,27 @@ USE_GCC_RUNTIME= yes @@ -18,27 +18,27 @@ USE_GCC_RUNTIME= yes
18 18
19# Stub libraries for functions missing from base system. 19# Stub libraries for functions missing from base system.
20.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \ 20.if !empty(MACHINE_PLATFORM:MDarwin-*-powerpc) || \
21 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \ 21 !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \
22 !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*) || \ 22 !empty(MACHINE_PLATFORM:MDarwin-1[0-9].*) || \
23 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \ 23 ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || \
24 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \ 24 ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS" || \
25 ${OPSYS} == "Linux" 25 ${OPSYS} == "Linux"
26PLIST_SRC+= ${PKGDIR}/PLIST.stub 26PLIST_SRC+= ${PKGDIR}/PLIST.stub
27.endif 27.endif
28 28
29# Optional components built only on certain platforms. 29# Optional components built only on certain platforms.
30.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ 30.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
31 !empty(MACHINE_ARCH:Marm) || \ 31 !empty(MACHINE_ARCH:M*arm*) || \
32 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") 32 (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
33BUILD_TARGET+= opt opt.opt 33BUILD_TARGET+= opt opt.opt
34PLIST_SRC+= ${PKGDIR}/PLIST.opt 34PLIST_SRC+= ${PKGDIR}/PLIST.opt
35. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \ 35. if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
36 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \ 36 empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
37 empty(MACHINE_PLATFORM:MSunOS-*-x86_64) && \ 37 empty(MACHINE_PLATFORM:MSunOS-*-x86_64) && \
38 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \ 38 empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \
39 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \ 39 empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && \
40 empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \ 40 empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) && \
41 empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \ 41 empty(MACHINE_PLATFORM:MNetBSD-*-arm) && \
42 empty(MACHINE_PLATFORM:MNetBSD-*-sparc) 42 empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
43PLIST_SRC+= ${PKGDIR}/PLIST.prof 43PLIST_SRC+= ${PKGDIR}/PLIST.prof
44. endif 44. endif