diff options
| author | is <is@pkgsrc.org> | 2011-08-03 12:50:42 +0000 |
|---|---|---|
| committer | is <is@pkgsrc.org> | 2011-08-03 12:50:42 +0000 |
| commit | aa8f144eeaad65d47ec16e496e552cf79aab2785 (patch) | |
| tree | 0a5819f3336c924f2c697fb9f42648b10c547d02 /net/unison | |
| parent | 4d38fe8284b7e8fd48d7337a662d0aefb9ad766b (diff) | |
| download | pkgsrc-aa8f144eeaad65d47ec16e496e552cf79aab2785.tar.gz | |
Compile to native code also for arm.
Require ocaml>=3.12.0nb2 for this, as the earlier compilers create code
that only runs on CPUs with the Thumb extension.
Diffstat (limited to 'net/unison')
| -rw-r--r-- | net/unison/Makefile | 10 | ||||
| -rw-r--r-- | net/unison/distinfo | 3 | ||||
| -rw-r--r-- | net/unison/patches/patch-Makefile.OCaml | 13 |
3 files changed, 22 insertions, 4 deletions
diff --git a/net/unison/Makefile b/net/unison/Makefile index 64e5cf7e54e..479184c1919 100644 --- a/net/unison/Makefile +++ b/net/unison/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2011/05/02 13:25:25 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2011/08/03 12:50:42 is Exp $ DISTNAME= unison-2.40.63 CATEGORIES= net @@ -12,7 +12,11 @@ LICENSE= gnu-gpl-v3 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.08.2 +.if (${MACHINE_ARCH} == "arm") +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.12.0nb2 +.else +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=3.08.2 +.endif # docs: unison-manual.pdf/html/ps/dvi WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -23,7 +27,7 @@ MAKE_ENV+= HOME=${WRKDIR:Q} .include "options.mk" .include "../../mk/bsd.prefs.mk" -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") +.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH}=="arm") MAKE_FLAGS+= NATIVE=true .else MAKE_FLAGS+= NATIVE=false diff --git a/net/unison/distinfo b/net/unison/distinfo index 7954887aeef..7b008fddc62 100644 --- a/net/unison/distinfo +++ b/net/unison/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.17 2011/05/02 13:25:25 wiz Exp $ +$NetBSD: distinfo,v 1.18 2011/08/03 12:50:43 is Exp $ SHA1 (unison-2.40.63.tar.gz) = 645e70bc37a5d4e8e9ccb7bad065fc579b18cf75 RMD160 (unison-2.40.63.tar.gz) = 5dede9ea2f1213d4a22ed1914da7bfb1921f9993 Size (unison-2.40.63.tar.gz) = 2601791 bytes +SHA1 (patch-Makefile.OCaml) = dbcd910b008830f555835be4c3c3cb09f7911134 SHA1 (patch-aa) = 09be0de200807825013537c75fca50f7d179be0a diff --git a/net/unison/patches/patch-Makefile.OCaml b/net/unison/patches/patch-Makefile.OCaml new file mode 100644 index 00000000000..e8892da01b9 --- /dev/null +++ b/net/unison/patches/patch-Makefile.OCaml @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.OCaml,v 1.1 2011/08/03 12:50:43 is Exp $ + +--- Makefile.OCaml.orig 2011-04-16 20:35:38.000000000 +0000 ++++ Makefile.OCaml +@@ -364,7 +364,7 @@ ifeq ($(PROFILING), true) + else + OCAMLC=ocamlc + endif +-OCAMLOPT=ocamlopt ++OCAMLOPT=ocamlopt.opt + + ifeq ($(NATIVE), true) + ## Set up for native code compilation |