summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Husmann2017-01-30 12:02:02 +0100
committerStefan Husmann2017-01-30 12:02:02 +0100
commit9d630071ec4c98233a79a26fe5a976753608519f (patch)
tree10a49d05cf15de83e4504768f0b8fd5db782a86b
parent38f916f0ff90d02205f93d7bdf330c0e763b7cd0 (diff)
downloadaur-9d630071ec4c98233a79a26fe5a976753608519f.tar.gz
adopt, update with patch
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD23
-rw-r--r--blank.patch21
3 files changed, 40 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90b567f0e737..688a22f674d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Jan 30 11:01:34 UTC 2017
pkgbase = mkcl-git
pkgdesc = ManKai Common Lisp -- git-version
- pkgver = 1.1.9.99.g8ca4595
+ pkgver = 1.1.10.12.g00f30cb
pkgrel = 1
url = http://common-lisp.net/project/mkcl/
arch = i686
@@ -13,9 +15,10 @@ pkgbase = mkcl-git
provides = cl-asdf
conflicts = mkcl
options = staticlibs
- options = !makeflags
source = git+https://gitlab.common-lisp.net/mkcl/mkcl.git
+ source = blank.patch
md5sums = SKIP
+ md5sums = 3d1beb963c043626c83ecec212d659f1
pkgname = mkcl-git
diff --git a/PKGBUILD b/PKGBUILD
index 6939ae98dc40..d9f6e6be06e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=mkcl-git
-pkgver=1.1.9.99.g8ca4595
+pkgver=1.1.10.12.g00f30cb
pkgrel=1
pkgdesc="ManKai Common Lisp -- git-version"
arch=('i686' 'x86_64')
@@ -10,24 +10,29 @@ depends=('gawk')
makedepends=('git')
provides=('common-lisp' 'cl-asdf')
conflicts=('mkcl')
-source=("git+https://gitlab.common-lisp.net/mkcl/mkcl.git")
-options=('staticlibs' '!makeflags')
-md5sums=('SKIP')
-_gitname="mkcl"
+source=("git+https://gitlab.common-lisp.net/mkcl/mkcl.git" blank.patch)
+options=('staticlibs')
+md5sums=('SKIP' '3d1beb963c043626c83ecec212d659f1')
+
+
+prepare() {
+ cd "${pkgname%-git}"
+ patch -Np1 < ../blank.patch
+}
pkgver() {
- cd $srcdir/$_gitname
+ cd "${pkgname%-git}"
git describe --tags | sed 's|-|.|g'|cut -c2-
}
build() {
- cd "$srcdir/$_gitname"
- CC=gcc ./configure --prefix=/usr
+ cd "${pkgname%-git}"
+ ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$_gitname"
+ cd "${pkgname%-git}"
make prefix="$pkgdir/usr" install
install -m 644 -D "Copyright" \
"$pkgdir/usr/share/licenses/$pkgname/Copyright"
diff --git a/blank.patch b/blank.patch
new file mode 100644
index 000000000000..fe25bf2364f3
--- /dev/null
+++ b/blank.patch
@@ -0,0 +1,21 @@
+diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
+index 51da7a6..0951787 100644
+--- a/src/cmp/cmpmain.lsp
++++ b/src/cmp/cmpmain.lsp
+@@ -158,7 +158,7 @@
+ (dolist (lib mkcl-libraries)
+ (push (mkcl:bstr+ "\"" mkcl-libdir lib "\" ") out))
+
+- (unless use-mkcl-shared-libs (push "-Wl,--no-whole-archive" out))
++ (unless use-mkcl-shared-libs (push "-Wl,--no-whole-archive " out))
+
+ (if use-external-shared-libs
+ (push *syslibs-&-ld-flags-tail* out)
+@@ -185,7 +185,7 @@
+ (dolist (lib *mkcl-static-libs*)
+ (push (mkcl:bstr+ "\"" mkcl-libdir lib "\" ") out)))
+
+- (push "-Wl,--no-whole-archive" out)
++ (push "-Wl,--no-whole-archive " out)
+
+ (push *static-program-ld-flags-tail* out) \ No newline at end of file