[arch-commits] Commit in lockdev/trunk (PKGBUILD gcc-4.7.patch)

[Balló György]

    Date: Friday, December 13, 2013 @ 16:58:58
  Author: bgyorgy
Revision: 102541

upgpkg: lockdev 1.0.3_1.5-4

Remove static lib, fix build with gcc 4.7

Added:
  lockdev/trunk/gcc-4.7.patch
Modified:
  lockdev/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++-----
 gcc-4.7.patch |   18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-13 11:46:14 UTC (rev 102540)
+++ PKGBUILD	2013-12-13 15:58:58 UTC (rev 102541)
@@ -6,17 +6,20 @@
 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}"
@@ -23,12 +26,12 @@
   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() {

Added: gcc-4.7.patch
===================================================================
--- gcc-4.7.patch	                        (rev 0)
+++ gcc-4.7.patch	2013-12-13 15:58:58 UTC (rev 102541)
@@ -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