diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-18 00:06:08 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-18 00:06:08 -0800 |
| commit | 995f428bf6c3170027dd5f9ea9f17e8fa4bdfac8 (patch) | |
| tree | 9321d3e4d17ef635f93e0b7a2923c288109a9c1f /extra/ocaml | |
| parent | 4e8c9530dbbf6c8b4c8147cef8fe9845c8898de3 (diff) | |
Fri Jan 18 00:06:07 PST 2013
Diffstat (limited to 'extra/ocaml')
| -rw-r--r-- | extra/ocaml/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/ocaml/tk8.6-build.patch | 20 |
2 files changed, 28 insertions, 3 deletions
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index d86e739e0..71c124d1e 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173841 2012-12-25 00:34:23Z foutrelis $ +# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') pkgver=4.00.1 -pkgrel=2 +pkgrel=3 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') license=('LGPL2' 'custom: QPL-1.0') @@ -12,7 +12,8 @@ url="http://caml.inria.fr/" depends=('gdbm') makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11') optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features') -source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz) +source=(http://caml.inria.fr/distrib/ocaml-4.00/${pkgname}-${pkgver}.tar.gz + tk8.6-build.patch) options=('!makeflags' '!emptydirs') build() { @@ -23,6 +24,8 @@ build() { package_ocaml() { cd "${srcdir}/${pkgbase}-${pkgver}" + # fix https://bugs.archlinux.org/task/33302 + patch -Np2 -i ../tk8.6-build.patch make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install # Save >10MB with this one, makepkg only strips debug symbols. @@ -55,3 +58,5 @@ optdepends=() install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') +md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' + '67b0a8a8885fc1221181b171541cb1b0') diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch new file mode 100644 index 000000000..439a930f0 --- /dev/null +++ b/extra/ocaml/tk8.6-build.patch @@ -0,0 +1,20 @@ +--- src/ocaml-4.00.1/configure 2012-06-26 08:33:50.000000000 -0700 ++++ p/src/ocaml-4.00.1/configure 2013-01-05 17:06:54.877900143 -0800 +@@ -804,6 +804,9 @@ + echo "ARCMD=ar" >> Makefile + + ++bytecccompopts="$bytecccompopts -DUSE_INTERP_RESULT" ++nativecccompopts="$nativecccompopts -DUSE_INTERP_RESULT" ++ + # Do #! scripts work? + + if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then +@@ -1450,6 +1453,7 @@ + if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then + echo "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"." + case $tcl_version in ++ 8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;; + 8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;; + 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; + 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; |