summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kubica2014-01-21 18:43:13 +0100
committerMarek Kubica2014-01-21 18:43:13 +0100
commit45648d11c937fb505b6c7b3e8dcf06adfe618fe8 (patch)
treed0d71d7e792b6348877e1c0843ac686578c4ca6c
parentd5040cca325842430e474f7d22a78c8567df2595 (diff)
downloadaur-45648d11c937fb505b6c7b3e8dcf06adfe618fe8.tar.gz
Added camomileLibrary.a to package
-rw-r--r--.SRCINFO4
-rw-r--r--0002-Install-missing-camomileLibrary.a.patch23
-rw-r--r--PKGBUILD15
3 files changed, 38 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 219444161361..d8e52f771947 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ocaml-camomile
pkgdesc = Comprehensive Unicode library for OCaml
pkgver = 0.8.5
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/yoriyuki/Camomile
arch = i686
arch = x86_64
@@ -11,7 +11,9 @@ pkgbase = ocaml-camomile
options = !strip
options = !makeflags
source = https://github.com/yoriyuki/camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2
+ source = 0002-Install-missing-camomileLibrary.a.patch
sha512sums = ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014
+ sha512sums = d3a802e00ec871fffab8896faffe1592c2e92e6ae33c5226cd8ba371ec8f8632d4079984c2f2238e907c5ebb8ece68d142a42e5071f6660eeeaf5be0bb15d0bd
pkgname = ocaml-camomile
diff --git a/0002-Install-missing-camomileLibrary.a.patch b/0002-Install-missing-camomileLibrary.a.patch
new file mode 100644
index 000000000000..23d300d1b38f
--- /dev/null
+++ b/0002-Install-missing-camomileLibrary.a.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Fri, 29 Jul 2011 19:46:45 +0200
+Subject: Install missing camomileLibrary.a
+
+Signed-off-by: Stephane Glondu <steph@glondu.net>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e1fc579..45dc0ac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -406,7 +406,7 @@ install-with-ocamlfind:
+ files= &&\
+ if [ -f camomileLibrary.cmx ]; then files=camomileLibrary.cmx; fi && \
+ if [ -f camomileLibrary.cma ]; then files="camomileLibrary.cma $$files"; fi && \
+- if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa $$files"; fi && \
++ if [ -f camomileLibrary.cmxa ]; then files="camomileLibrary.cmxa camomileLibrary.a $$files"; fi && \
+ if [ -f camomileLibraryDefault.cmx ]; then files="camomileLibraryDefault.cmx $$files"; fi && \
+ if [ -f camomileLibraryDyn.cmx ]; then files="camomileLibraryDyn.cmx $$files"; fi && \
+ if [ -f camomile.cma ]; then files="camomile.cma $$files"; fi&& \
+--
diff --git a/PKGBUILD b/PKGBUILD
index 1f4bfca28ae1..718c65445669 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,16 +2,25 @@
# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com>
pkgname=ocaml-camomile
pkgver=0.8.5
-pkgrel=2
+pkgrel=3
pkgdesc="Comprehensive Unicode library for OCaml"
arch=('i686' 'x86_64')
url="https://github.com/yoriyuki/Camomile"
license=('LGPL')
makedepends=('ocaml' 'ocaml-findlib>=1.2.3')
-source=(https://github.com/yoriyuki/${pkgname/ocaml-}/releases/download/rel-$pkgver/${pkgname/ocaml-/}-$pkgver.tar.bz2)
-sha512sums=('ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014')
+source=(https://github.com/yoriyuki/${pkgname/ocaml-}/releases/download/rel-$pkgver/${pkgname/ocaml-/}-$pkgver.tar.bz2
+ 0002-Install-missing-camomileLibrary.a.patch)
+sha512sums=('ef4da32f955e69e0b2958b4b2bf12ae94e210d8aa7cee5a9030607b79ac43a884758549f3164c223fb07d987a4a50b15f0bc5083ff67120270409f7fb9928014'
+ 'd3a802e00ec871fffab8896faffe1592c2e92e6ae33c5226cd8ba371ec8f8632d4079984c2f2238e907c5ebb8ece68d142a42e5071f6660eeeaf5be0bb15d0bd')
options=(!strip !makeflags)
+prepare() {
+ cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"
+ # Patch from Debian, Slackware to add camomileLibrary.a which is required
+ # for some code to build
+ patch -Np1 -i ../0002-Install-missing-camomileLibrary.a.patch
+}
+
build() {
cd "${srcdir}/${pkgname/ocaml-/}-${pkgver}"