Offer -Werror option

3 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f9075869168..9b92bbfdb56f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Mar 28 05:05:33 UTC 2017
+# Tue Mar 28 05:37:43 UTC 2017
 pkgbase = ldmtool
 	pkgdesc = tool for managing Microsoft Windows dynamic disks
 	pkgver = 0.2.3
@@ -18,7 +18,7 @@ pkgbase = ldmtool
 	source = sysmacros.patch
 	sha256sums = bc2d930f46f070d446e587f65f66b2fca4af5017439f6f821ae45bff7cb944ad
 	sha256sums = 7e4699a1544046a9ccc14e4ec7b36cb901123783f5d456795632d2ffa28ab886
-	sha256sums = 5cbf10b78a032351dd32133086fc44b018509fc5c9859d8195c1deb1fba0d5e9
+	sha256sums = 503052d3fb15869f5ed3b3425299dce64b20e40d1df58eeb9d863ec97d0e7ce9
 
 pkgname = ldmtool
 	depends = gtk-doc
diff --git a/PKGBUILD b/PKGBUILD
index 3c15edcf2731..349b9c203832 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ source=(
 )
 sha256sums=('bc2d930f46f070d446e587f65f66b2fca4af5017439f6f821ae45bff7cb944ad'
             '7e4699a1544046a9ccc14e4ec7b36cb901123783f5d456795632d2ffa28ab886'
-            '5cbf10b78a032351dd32133086fc44b018509fc5c9859d8195c1deb1fba0d5e9')
+            '503052d3fb15869f5ed3b3425299dce64b20e40d1df58eeb9d863ec97d0e7ce9')
 
 if [ "${pkgname%-git}" != "${pkgname}" ]; then # this is easily done with case
   unset _verwatch
@@ -47,15 +47,27 @@ prepare() {
   set -u
   cd "${_srcdir}"
   patch -b -p0 -i "${srcdir}/${pkgname}-${pkgver}.patch"
-  patch -b -p0 -i "${srcdir}/sysmacros.patch"
-  # prevent build error in yaourt
-  BUILDDIR= \
-  bash -u -e ./autogen.sh --prefix='/usr'
-  #./configure --prefix='/usr'
+  patch -b -p0 -i "${srcdir}/sysmacros.patch" #  diff -u3 src/ldm.c{.orig,} > '../../sysmacros.patch'
+  _configure
+  set +u
+}
+
+_configure() {
+  set -u
+  cd "${srcdir}/${_srcdir}"
+  if [ ! -s 'Makefile' ]; then
+    # prevent build error in yaourt
+    BUILDDIR= \
+    bash -u -e ./autogen.sh --prefix='/usr'
+    #./configure --prefix='/usr'
+    #sed -e 's:-Werror::g' -i 'src/Makefile' 'test/Makefile'
+  fi
+  cd "${srcdir}"
   set +u
 }
 
 build() {
+  _configure
   set -u
   cd "${_srcdir}"
   local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
diff --git a/sysmacros.patch b/sysmacros.patch
index 37af4eeb7043..ca2337c74f0d 100644
--- a/sysmacros.patch
+++ b/sysmacros.patch
@@ -1,10 +1,10 @@
---- src/ldm.c   2017-03-28 09:18:32.885536944 +0900
-+++ src/ldm.c   2017-03-28 09:18:51.775537236 +0900
+--- src/ldm.c.orig	2012-09-21 06:34:41.000000000 -0400
++++ src/ldm.c	2017-03-28 01:12:09.820344261 -0400
 @@ -33,6 +33,7 @@
  #include <sys/stat.h>
  #include <unistd.h>
  #include <uuid/uuid.h>
 +#include <sys/sysmacros.h>
-
+ 
  #include "mbr.h"
  #include "gpt.h"