From 4b16398bab7b258fb84c0df2a6cf4e7943bdbfd4 Mon Sep 17 00:00:00 2001 From: Diego Sogari Date: Thu, 10 Mar 2016 19:41:09 -0300 Subject: [PATCH] gflags version 2.1.2 (package release 1) --- mingw-w64-gflags/PKGBUILD | 55 ++++++++++++++++++++++++++ mingw-w64-gflags/gflags-2.1.2.patch | 61 +++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 mingw-w64-gflags/PKGBUILD create mode 100644 mingw-w64-gflags/gflags-2.1.2.patch diff --git a/mingw-w64-gflags/PKGBUILD b/mingw-w64-gflags/PKGBUILD new file mode 100644 index 0000000000..153777b698 --- /dev/null +++ b/mingw-w64-gflags/PKGBUILD @@ -0,0 +1,55 @@ +# Maintainer: Diego Sogari + +_realname=gflags +pkgbase=mingw-w64-${_realname} +pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" +pkgver=2.1.2 +pkgrel=1 +pkgdesc="Google's Commandline flags module for C++ (mingw-w64)" +arch=('any') +url="https://gflags.github.io/gflags/" +license=('New BSD License') +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-curl" + "${MINGW_PACKAGE_PREFIX}-python2" + "automake" "autoconf") +depends=("${MINGW_PACKAGE_PREFIX}-boost" + "${MINGW_PACKAGE_PREFIX}-uriparser" + "${MINGW_PACKAGE_PREFIX}-zlib") +checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest") +source=("${_realname}-${pkgver}.tar.gz::https://codeload.github.com/gflags/gflags/tar.gz/v${pkgver}" + "${_realname}-${pkgver}.patch") +sha256sums=('d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662' + '59d4ec0bd38e316ae5ba601eabae71266a7b68cd8d5ce081d60d200a928f72a2') + +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" + patch -Np1 -i "../${_realname}-${pkgver}.patch" +} + +build() { + rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DBUILD_STATIC_LIBS=YES \ + -DBUILD_SHARED_LIBS=YES \ + -DBUILD_TESTING=YES \ + "../${_realname}-${pkgver}" + + make +} + +check() { + cd "${srcdir}/build-${MINGW_CHOST}" + make test +} + +package() { + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install +} diff --git a/mingw-w64-gflags/gflags-2.1.2.patch b/mingw-w64-gflags/gflags-2.1.2.patch new file mode 100644 index 0000000000..214fbac2ef --- /dev/null +++ b/mingw-w64-gflags/gflags-2.1.2.patch @@ -0,0 +1,61 @@ +diff -c -r gflags-2.1.2.orig/CMakeLists.txt gflags-2.1.2/CMakeLists.txt +*** gflags-2.1.2.orig/CMakeLists.txt 2015-03-24 13:19:41.000000000 -0300 +--- gflags-2.1.2/CMakeLists.txt 2016-03-10 19:34:47.991173900 -0300 +*************** +*** 321,327 **** + + # ---------------------------------------------------------------------------- + # installation +! if (OS_WINDOWS) + set (RUNTIME_INSTALL_DIR Bin) + set (LIBRARY_INSTALL_DIR Lib) + set (INCLUDE_INSTALL_DIR Include) +--- 321,327 ---- + + # ---------------------------------------------------------------------------- + # installation +! if (OS_WINDOWS AND NOT MINGW) + set (RUNTIME_INSTALL_DIR Bin) + set (LIBRARY_INSTALL_DIR Lib) + set (INCLUDE_INSTALL_DIR Include) +*************** +*** 346,352 **** + configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) + configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) + +! install (TARGETS ${TARGETS} DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) + if (INSTALL_HEADERS) + install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_INCLUDE_DIR}) + install ( +--- 346,356 ---- + configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) + configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) + +! install (TARGETS ${TARGETS} EXPORT gflags-lib +! RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR} +! LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} +! ARCHIVE DESTINATION ${LIBRARY_INSTALL_DIR} +! ) + if (INSTALL_HEADERS) + install (FILES ${PUBLIC_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/${GFLAGS_INCLUDE_DIR}) + install ( +diff -c -r gflags-2.1.2.orig/src/config.h.in gflags-2.1.2/src/config.h.in +*** gflags-2.1.2.orig/src/config.h.in 2015-03-24 13:19:41.000000000 -0300 +--- gflags-2.1.2/src/config.h.in 2016-03-10 19:35:37.039204900 -0300 +*************** +*** 73,79 **** + // --------------------------------------------------------------------------- + // Path separator + #ifndef PATH_SEPARATOR +! # ifdef OS_WINDOWS + # define PATH_SEPARATOR '\\' + # else + # define PATH_SEPARATOR '/' +--- 73,79 ---- + // --------------------------------------------------------------------------- + // Path separator + #ifndef PATH_SEPARATOR +! # if defined(OS_WINDOWS) && not defined(__MINGW32__) + # define PATH_SEPARATOR '\\' + # else + # define PATH_SEPARATOR '/'