diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /community/lockdev | |
parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'community/lockdev')
-rw-r--r-- | community/lockdev/PKGBUILD | 15 | ||||
-rw-r--r-- | community/lockdev/gcc-4.7.patch | 18 |
2 files changed, 27 insertions, 6 deletions
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 8694c7513..99f620f92 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $ +# $Id: PKGBUILD 102542 2013-12-13 15:59:07Z 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,29 +6,32 @@ pkgname=lockdev pkgver=1.0.3_1.5 _pkgver=1.0.3 -pkgrel=3 +pkgrel=4 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') +depends=('glibc') 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" - 'build.patch') + 'build.patch' + 'gcc-4.7.patch') md5sums=('64b9c1b87b125fc348e892e24625524a' 'c4e8a5a2e46b76b48339c232b358f579' - '2db93cadf6670ddcd01de4bfc22a35e1') + '2db93cadf6670ddcd01de4bfc22a35e1' + 'e16faebfa2d162d40830ef6f2700b7ba') 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 + patch -p1 -i ../gcc-4.7.patch # FS#34457 } 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" + make CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC" } package() { diff --git a/community/lockdev/gcc-4.7.patch b/community/lockdev/gcc-4.7.patch new file mode 100644 index 000000000..3b11e0b92 --- /dev/null +++ b/community/lockdev/gcc-4.7.patch @@ -0,0 +1,18 @@ +diff -Naur lockdev-1.0.3.orig/src/ttylock.h lockdev-1.0.3/src/ttylock.h +--- lockdev-1.0.3.orig/src/ttylock.h 2013-12-13 15:34:52.195877321 +0000 ++++ lockdev-1.0.3/src/ttylock.h 2013-12-13 15:38:16.131190480 +0000 +@@ -36,10 +36,10 @@ + + /* API of the library */ + +-int ttylock (char * devname); +-int ttywait (char * devname); +-int ttyunlock (char * devname); +-int ttylocked (char * devname); ++static inline int ttylock (char * devname); ++static inline int ttywait (char * devname); ++static inline int ttyunlock (char * devname); ++static inline int ttylocked (char * devname); + + + static inline int |