summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD23
2 files changed, 11 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9eb313f4046e..ae63e5b370a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-google-glog
pkgdesc = Logging library for C++ (mingw-w64)
- pkgver = 0.6.0
+ pkgver = 0.7.0
pkgrel = 1
url = https://github.com/google/glog
arch = any
@@ -9,7 +9,7 @@ pkgbase = mingw-w64-google-glog
options = !strip
options = !buildflags
options = staticlibs
- source = glog-0.6.0.tar.gz::https://github.com/google/glog/archive/v0.6.0.tar.gz
- sha512sums = fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
+ source = glog-0.7.0.tar.gz::https://github.com/google/glog/archive/v0.7.0.tar.gz
+ sha512sums = 7222bb432c2b645238018233b2d18f254156617ef2921d18d17364866a7a3a05533fff1d63fd5033e1e5d3746a11806d007e7a36efaff667a0d3006dee45c278
pkgname = mingw-w64-google-glog
diff --git a/PKGBUILD b/PKGBUILD
index 67092fe8ec7e..152502263a5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=glog
pkgname=mingw-w64-google-$_pkgname
-pkgver=0.6.0
+pkgver=0.7.0
pkgrel=1
pkgdesc="Logging library for C++ (mingw-w64)"
arch=(any)
@@ -9,22 +9,19 @@ url='https://github.com/google/glog'
makedepends=('mingw-w64-cmake')
options=(!strip !buildflags staticlibs)
source=("glog-$pkgver.tar.gz::https://github.com/google/glog/archive/v$pkgver.tar.gz")
-sha512sums=('fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226')
+sha512sums=('7222bb432c2b645238018233b2d18f254156617ef2921d18d17364866a7a3a05533fff1d63fd5033e1e5d3746a11806d007e7a36efaff667a0d3006dee45c278')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
build() {
cd $_pkgname-$pkgver
- sed -i "s/check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF)/set (HAVE_SNPRINTF 1)/" CMakeLists.txt
for _arch in ${_architectures}; do
- mkdir -p build-$_arch
- pushd build-$_arch
- $_arch-cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS:BOOL=ON
+ mkdir -p build-$_arch && pushd build-$_arch
+ $_arch-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DWITH_PKGCONFIG=ON -DBUILD_SHARED_LIBS=ON ..
make
popd
- mkdir -p build-$_arch-static
- pushd build-$_arch-static
- $_arch-cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS:BOOL=OFF
+ mkdir -p build-$_arch-static && pushd build-$_arch-static
+ $_arch-cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DWITH_PKGCONFIG=ON -DBUILD_SHARED_LIBS=OFF ..
make
popd
done
@@ -33,12 +30,8 @@ build() {
package() {
cd $_pkgname-$pkgver
for _arch in ${_architectures}; do
- pushd build-$_arch-static
- make DESTDIR="$pkgdir" install
- popd
- pushd build-$_arch
- make DESTDIR="$pkgdir" install
- popd
+ make DESTDIR="$pkgdir" install -C build-$_arch-static
+ make DESTDIR="$pkgdir" install -C build-$_arch
install -D -m644 COPYING "$pkgdir"/usr/${_arch}/share/licenses/google-$_pkgname/COPYING
${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a