summaryrefslogtreecommitdiff
path: root/community/lockdev
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-09-12 01:43:12 -0700
committerroot <root@rshg054.dnsready.net>2013-09-12 01:43:12 -0700
commit67c663ff9aaeee1572097ef4eceb39c039d91f42 (patch)
tree4d2b7879f5acbe2a2782593532b37a13c7a9c87b /community/lockdev
parent2cfbbdcb041073ed1f9aff2f2fd630b24e039e6d (diff)
Thu Sep 12 01:42:53 PDT 2013
Diffstat (limited to 'community/lockdev')
-rw-r--r--community/lockdev/PKGBUILD17
-rw-r--r--community/lockdev/build.patch30
2 files changed, 41 insertions, 6 deletions
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 5a4de60d5..8694c7513 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83333 2013-01-29 17:40:17Z spupykin $
+# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de>
@@ -6,22 +6,27 @@
pkgname=lockdev
pkgver=1.0.3_1.5
_pkgver=1.0.3
-pkgrel=2
+pkgrel=3
pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
url='http://packages.qa.debian.org/l/lockdev.html'
license=("GPL")
arch=('i686' 'x86_64')
source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
- "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz")
+ "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
+ 'build.patch')
md5sums=('64b9c1b87b125fc348e892e24625524a'
- 'c4e8a5a2e46b76b48339c232b358f579')
+ 'c4e8a5a2e46b76b48339c232b358f579'
+ '2db93cadf6670ddcd01de4bfc22a35e1')
-build() {
+prepare() {
cd "${pkgname}-${_pkgver}"
-
patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile
+ patch -p1 -i ../build.patch # FS#33280
+}
+build() {
+ cd "${pkgname}-${_pkgver}"
make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
}
diff --git a/community/lockdev/build.patch b/community/lockdev/build.patch
new file mode 100644
index 000000000..f1053d032
--- /dev/null
+++ b/community/lockdev/build.patch
@@ -0,0 +1,30 @@
+commit 0dd47123655c52d68185f06b9da8fb0e1b925400
+Author: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Tue Feb 9 14:56:23 2010 +0100
+
+ RedHat patch 2
+
+ - change library file name
+ - install devel symlink
+
+diff --git a/Makefile b/Makefile
+index b7b4d1f..3b351dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -11,7 +11,7 @@ VER = $(shell expr `pwd` : '.*-\([0-9.]*\)')
+ MVER = ${shell expr `pwd` : '.*-\([0-9]*\).[0-9]*'}
+
+ static = ${libname}.a
+-shared = ${libname}.${VER}.so
++shared = ${libname}.so.${VER}
+ soname = ${libname}.so.${MVER}
+
+ # overwritten by caller (e.g.: debian/rules)
+@@ -76,6 +76,7 @@ install_doc: docs/lockdev.3
+ install_run: ${shared}
+ install -m755 -d ${libdir}
+ install -m644 ${shared} ${libdir}
++ ln -s ${shared} ${libdir}/liblockdev.so
+
+ .PHONY: clean distclean perl-clean mostyclean
+ perl-clean: clean