Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update mingw-w64 runtime for MSYS2 to git SHA [c8b6742]

Browse Source
This commit is contained in:
Alexpux 2015-03-04 01:09:26 +03:00
parent bb00260b05
commit a049147404
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
msys2-w32api-headers/PKGBUILD
View File

@ -1,8 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('msys2-w32api-headers')
_ver_base=4.0.0
pkgver=4.0.0.4379.3403da3
pkgver=5.0.0.4456.c8b6742
pkgrel=1
pkgdesc="Win32 API headers for MSYS2 32bit toolchain"
arch=('i686' 'x86_64')
@ -14,14 +13,24 @@ makedepends=('git' 'mingw-w64-cross-gcc')
#provides=($pkgname)
#conflicts=($pkgname)
options=('staticlibs' '!buildflags')
source=('msys2-w32api-headers'::'git://git.code.sf.net/p/mingw-w64/mingw-w64')
md5sums=('SKIP')
source=('msys2-w32api-headers'::'git://git.code.sf.net/p/mingw-w64/mingw-w64'
cygwin-conflicts.patch)
md5sums=('SKIP'
'33187b4893296d1ad899b7f3ffc4198c')
MINGW_CHOST=${CARCH}-w64-mingw32
prepare() {
cd "$srcdir/${pkgname}"
patch -p1 -i ${srcdir}/cygwin-conflicts.patch
}
pkgver() {
cd "$srcdir/$pkgname"
printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
cd "$srcdir/${pkgname}"
local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
local _rev=0
printf "%s.%s.%s.%s.%s" ${_major} ${_minor} ${_rev} "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {

13
msys2-w32api-headers/cygwin-conflicts.patch Normal file
View File

@ -0,0 +1,13 @@
--- msys2-w32api-headers/mingw-w64-headers/include/netioapi.h.orig 2015-03-03 22:12:25.029800000 +0300
+++ msys2-w32api-headers/mingw-w64-headers/include/netioapi.h 2015-03-03 22:12:45.590600000 +0300
@@ -371,8 +371,10 @@
NETIO_STATUS NETIOAPI_API_ ConvertInterfaceAliasToLuid (CONST WCHAR *InterfaceAlias, PNET_LUID InterfaceLuid);
NETIO_STATUS NETIOAPI_API_ ConvertInterfaceLuidToGuid (CONST NET_LUID *InterfaceLuid, GUID *InterfaceGuid);
NETIO_STATUS NETIOAPI_API_ ConvertInterfaceGuidToLuid (CONST GUID *InterfaceGuid, PNET_LUID InterfaceLuid);
+#ifndef __CYGWIN__
NET_IFINDEX NETIOAPI_API_ if_nametoindex (PCSTR InterfaceName);
PCHAR NETIOAPI_API_ if_indextoname (NET_IFINDEX InterfaceIndex, PCHAR InterfaceName);
+#endif
NET_IF_COMPARTMENT_ID NETIOAPI_API_ GetCurrentThreadCompartmentId (VOID);
NETIO_STATUS NETIOAPI_API_ SetCurrentThreadCompartmentId (NET_IF_COMPARTMENT_ID CompartmentId);
NET_IF_COMPARTMENT_ID NETIOAPI_API_ GetSessionCompartmentId (ULONG SessionId);

10
msys2-w32api-runtime/PKGBUILD
View File

@ -1,8 +1,7 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
pkgname=('msys2-w32api-runtime')
_ver_base=4.0.0
pkgver=4.0.0.4379.3403da3
pkgver=5.0.0.4455.32db221
pkgrel=1
pkgdesc="Win32 API import libs for MSYS2 toolchain"
arch=('i686' 'x86_64')
@ -20,8 +19,11 @@ md5sums=('SKIP')
MINGW_CHOST=${CARCH}-w64-mingw32
pkgver() {
cd "$srcdir/$pkgname"
printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
cd "$srcdir/${pkgname}"
local _major=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MAJOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
local _minor=$(head -n 16 mingw-w64-headers/crt/_mingw_mac.h | grep '__MINGW64_VERSION_MINOR' | sed -e 's/.* //' | tr '\n' '.' | sed 's/.$/\n/')
local _rev=0
printf "%s.%s.%s.%s.%s" ${_major} ${_minor} ${_rev} "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {