Update version

2 files changed, 31 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d079544615fa..999cf5922981 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jun 17 17:49:41 UTC 2016
+# Wed Sep 14 20:07:07 UTC 2016
 pkgbase = mingw-w64-c++utilities
-	pkgdesc = Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64).
-	pkgver = 3.4.1
+	pkgdesc = Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)
+	pkgver = 4.0.0
 	pkgrel = 1
 	url = https://github.com/Martchus/cpp-utilities
 	arch = any
@@ -10,13 +10,14 @@ pkgbase = mingw-w64-c++utilities
 	makedepends = mingw-w64-gcc
 	makedepends = mingw-w64-cmake
 	depends = mingw-w64-crt
-	optdepends = c++utilities-doc: API documentation
+	depends = mingw-w64-libiconv
+	optdepends = mingw-w64-c++utilities-doc: API documentation
 	options = !buildflags
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = c++utilities-3.4.1.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v3.4.1.tar.gz
-	sha256sums = 133fd8619d9ebb9c8f0d683856f55cd71e17cacee178600389140fad59eb8977
+	source = cpp-utilities-4.0.0.tar.gz::https://github.com/Martchus/cpp-utilities/archive/v4.0.0.tar.gz
+	sha256sums = 903ac50b3c4104728d077cb851a9f9628c3cfdcba6a20e826b7cbe8debf44083
 
 pkgname = mingw-w64-c++utilities
 
diff --git a/PKGBUILD b/PKGBUILD
index f47348810c15..84e5766aa0ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,39 +3,47 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_name=c++utilities
 _reponame=cpp-utilities
 pkgname=mingw-w64-c++utilities
-pkgver=3.4.1
+_name=${pkgname#mingw-w64-}
+pkgver=4.0.0
 pkgrel=1
 arch=('any')
-pkgdesc="Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)."
+pkgdesc='Common C++ classes and routines such as argument parser, IO and conversion utilities (mingw-w64)'
 license=('GPL')
-depends=('mingw-w64-crt')
-optdepends=('c++utilities-doc: API documentation')
+depends=('mingw-w64-crt' 'mingw-w64-libiconv')
+optdepends=("$pkgname-doc: API documentation")
 makedepends=('mingw-w64-gcc' 'mingw-w64-cmake')
 url="https://github.com/Martchus/${_reponame}"
-source=("c++utilities-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
-sha256sums=('133fd8619d9ebb9c8f0d683856f55cd71e17cacee178600389140fad59eb8977')
+source=("${_reponame}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
+sha256sums=('903ac50b3c4104728d077cb851a9f9628c3cfdcba6a20e826b7cbe8debf44083')
 options=(!buildflags staticlibs !strip !emptydirs)
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+_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')
 
 build() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
-  # build utilities for each architecture
+  export CXXFLAGS='-O0'
   for _arch in ${_architectures}; do
-    mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" ../
-    make
-    popd
+    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
   done
 }
 
 package() {
   cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
   for _arch in ${_architectures}; do
-    pushd build-${_arch}
-    make DESTDIR="${pkgdir}" install-mingw-w64-strip
-    popd
+    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
   done
 }