Update to 4.2.0

2 files changed, 15 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5102f2953d7c..aee3dffca649 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct  3 12:24:42 UTC 2016
+# Sun Oct 30 16:45:15 UTC 2016
 pkgbase = mingw-w64-c++utilities
 	pkgdesc = Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)
-	pkgver = 4.1.0
+	pkgver = 4.2.0
 	pkgrel = 1
 	url = https://github.com/Martchus/cpp-utilities
 	arch = any
@@ -16,8 +16,8 @@ pkgbase = mingw-w64-c++utilities
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = c++utilities-4.1.0.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v4.1.0.tar.gz
-	sha256sums = ae00eb82754d9d49b0956444079bb1bcccd345e7ecaf06e3e91f33c81ffe4cbf
+	source = c++utilities-4.2.0.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v4.2.0.tar.gz
+	sha256sums = 5f247a1b69f68ac8e7863caecb3ad0d644e136d5fa9effbe73bd252586f03fdd
 
 pkgname = mingw-w64-c++utilities
 
diff --git a/PKGBUILD b/PKGBUILD
index 1085abf6e7a4..f92562ef04f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
 _name=${pkgname#mingw-w64-}
-pkgver=4.1.0
+pkgver=4.2.0
 pkgrel=1
 arch=('any')
 pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
@@ -16,33 +16,27 @@ optdepends=("$pkgname-doc: API documentation")
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
 source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('ae00eb82754d9d49b0956444079bb1bcccd345e7ecaf06e3e91f33c81ffe4cbf')
+sha256sums=('5f247a1b69f68ac8e7863caecb3ad0d644e136d5fa9effbe73bd252586f03fdd')
 options=(!buildflags staticlibs !strip !emptydirs)
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-[[ $NO_STATIC_LIBS ]] || _configurations+=('static: -DENABLE_STATIC_LIBS:BOOL=ON -DDISABLE_SHARED_LIBS:BOOL=ON')
-[[ $NO_SHARED_LIBS ]] || _configurations+=('shared: -DENABLE_STATIC_LIBS:BOOL=OFF -DDISABLE_SHARED_LIBS:BOOL=OFF')
+[[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'
+[[ $NO_SHARED_LIBS ]] && _configurations+=' -DDISABLE_SHARED_LIBS:BOOL=ON'
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    for _config in "${_configurations[@]}"; do
-      msg2 "Building ${_config%%: *} version for ${_arch}"
-      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
-      ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_config#*: } ../
-      make
-      popd
-    done
+    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
+    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ${_configurations} ../
+    make
+    popd
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    for _config in "${_configurations[@]}"; do
-      msg2 "Packaging ${_config%%: *} version for ${_arch}"
-      mkdir -p "build-${_arch}-${_config%%: *}" && pushd "build-${_arch}-${_config%%: *}"
-      make DESTDIR="${pkgdir}" install-mingw-w64-strip
-      popd
-    done
+    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
+    make DESTDIR="${pkgdir}" install-mingw-w64-strip
+    popd
   done
 }