mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/opam: fix stubsdir name from stubslibs to stublibs

Browse Source
This commit is contained in:
Jakub Jirutka 2018-03-08 16:39:07 +01:00
parent f409292f85
commit d118b3f909
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
community/opam/APKBUILD
View File

@ -2,7 +2,7 @@
# Maintainer: Anil Madhavapeddy <anil@recoil.org>
pkgname=opam
pkgver=1.2.2
pkgrel=2
pkgrel=3
pkgdesc="OCaml Package Manager"
url="https://opam.ocaml.org"
arch="all !x86 !armhf !s390x" # ocaml not avail on excluded platforms
@ -11,7 +11,8 @@ depends="ocaml camlp4 curl tar unzip rsync aspcud patch"
makedepends="$depends_dev"
install=""
subpackages=""
source="https://github.com/ocaml/$pkgname/releases/download/$pkgver/$pkgname-full-$pkgver.tar.gz"
source="https://github.com/ocaml/$pkgname/releases/download/$pkgver/$pkgname-full-$pkgver.tar.gz
fix-default-stubsdir.patch"
builddir="$srcdir"/$pkgname-full-$pkgver
build() {
@ -33,6 +34,5 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
md5sums="7d348c2898795e9f325fb80eaaf5eae8 opam-full-1.2.2.tar.gz"
sha256sums="15e617179251041f4bf3910257bbb8398db987d863dd3cfc288bdd958de58f00 opam-full-1.2.2.tar.gz"
sha512sums="f095ef4c02e6a411ee115b508c7dc21cf6480f60ad5d84ed5ce5868afa1f6225ead0eb6703763d803edc22595e83db67cdd1a4ecab50ee2c62c20965b0542436 opam-full-1.2.2.tar.gz"
sha512sums="f095ef4c02e6a411ee115b508c7dc21cf6480f60ad5d84ed5ce5868afa1f6225ead0eb6703763d803edc22595e83db67cdd1a4ecab50ee2c62c20965b0542436 opam-full-1.2.2.tar.gz
704a9d36b93267a982fd5bad99637338afab6b0a8edbbb127e17065e27d54ef752a10565e8078e1c4d63e16f95f5df11fd1f26de4925042a57b0dd678fe33d2e fix-default-stubsdir.patch"

24
community/opam/fix-default-stubsdir.patch Normal file
View File

@ -0,0 +1,24 @@
From 718d6198e338069852dcdde067f56df236235370 Mon Sep 17 00:00:00 2001
From: Louis Gesbert <louis.gesbert@ocamlpro.com>
Date: Mon, 7 Aug 2017 12:45:47 +0200
Subject: [PATCH] Fix opam-installer (stubsdir = "stubslibs" -> "stublibs")
Patch-Source: https://github.com/ocaml/opam/commit/718d6198e338069852dcdde067f56df236235370
See-Also: https://github.com/ocaml/dune/issues/108#issuecomment-329178318
---
src/tools/opam_installer.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/opam_installer.ml b/src/tools/opam_installer.ml
index b35af249b..3e5ebfcb9 100644
--- a/src/tools/opam_installer.ml
+++ b/src/tools/opam_installer.ml
@@ -312,7 +312,7 @@
let mandir = mk_dir mandir in
let libdir = mk_dir libdir in
let stubsdir = match mk_dir stubsdir, libdir with
- | None, Some d -> Some OpamFilename.OP.(d / "stubslibs")
+ | None, Some d -> Some OpamFilename.OP.(d / "stublibs")
| d, None | (Some _ as d), _ -> d
in
let topdir = match mk_dir topdir, libdir with