diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-08 02:34:09 -0700 |
| commit | 3a0ad5dc35d5cff379cdfc736b9cae856416fe6a (patch) | |
| tree | a6af20a38d47d7a7ae8e1b98f70005c54644bbdd /extra/ocaml | |
| parent | 9159b8ca1c97a398204d7a7d4d78c3394639bd02 (diff) | |
Tue Oct 8 02:32:53 PDT 2013
Diffstat (limited to 'extra/ocaml')
| -rw-r--r-- | extra/ocaml/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/ocaml/tk8.6-build.patch | 20 |
2 files changed, 7 insertions, 32 deletions
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD index 71c124d1e..49f852159 100644 --- a/extra/ocaml/PKGBUILD +++ b/extra/ocaml/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 175505 2013-01-17 15:01:31Z tpowa $ +# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgbase='ocaml' pkgname=('ocaml' 'ocaml-compiler-libs') -pkgver=4.00.1 -pkgrel=3 +pkgver=4.01.0 +pkgrel=1 pkgdesc="A functional language with OO extensions" arch=('i686' 'x86_64') -license=('LGPL2' 'custom: QPL-1.0') +license=('LGPL2.1' 'custom: QPL-1.0') 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 - tk8.6-build.patch) +source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz) options=('!makeflags' '!emptydirs') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure -prefix /usr + ./configure -prefix /usr -x11include /usr/include make world.opt } 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. @@ -57,6 +54,4 @@ optdepends=() install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" } -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7') -md5sums=('91124a8eb12a57f1e56c02fe3db0f9e7' - '67b0a8a8885fc1221181b171541cb1b0') +md5sums=('04dfdd7da189462a4f10ec6530359cef') diff --git a/extra/ocaml/tk8.6-build.patch b/extra/ocaml/tk8.6-build.patch deleted file mode 100644 index 439a930f0..000000000 --- a/extra/ocaml/tk8.6-build.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 ;; |