Merge pull request #627 from dscho/accommodate-for-pc-cygwin-change

Accommodate for `pc-msys` -> `pc-cygwin` change

Author: dscho

git-extra/PKGBUILD

@@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
 pkgname=($_realname
         "${MINGW_PACKAGE_PREFIX}-${_realname}")
 _ver_base=1.1
-pkgver=1.1.659.e3eddae38
+pkgver=1.1.663.1dcfb5e44
 pkgrel=1
 pkgdesc="Git for Windows extra files"
 arch=('any')
@@ -80,7 +80,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
             '683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
             '1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
             '2ad7292f8ea4aa7d027221bff2a987ad8e7c72a6866a5f14ea67f6187e850244'
-            '180e05c1b8afa34d59cb2f6635bc75fece10474f37e164ea5916a6b3b56e20dd'
+            '1f83355ec7be0f11239b68d3b9d4d04534b347212a9eac4335397875a13514ef'
             '22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
             '38c0cf57e03d275cdd42984f102bee8352fac672f875ab23c46b9625eefc49f3'
             '15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'

git-extra/git-sdk.sh

@@ -360,6 +360,7 @@ sdk () {
 				  git diff-index --quiet HEAD ||
 				  test ! -s .git/index ||
 				  (uname_m="$(uname -m)" &&
+				    test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin" &&
 				    test ! -d "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"); }
 			then
 				# no local changes
@@ -370,7 +371,12 @@ sdk () {
 
 			# Build the current branch
 			(uname_m="$(uname -m)" &&
-			 cd "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin" &&
+			 if test -d "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
+			 then
+				cd "../build-$uname_m-pc-msys/$uname_m-pc-cygwin/winsup/cygwin"
+			 else
+				cd "../build-$uname_m-pc-msys/$uname_m-pc-msys/winsup/cygwin"
+			 fi &&
 			 make -j$(nproc))
 			return $?
 			;;

please.sh

@@ -3130,6 +3130,9 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
 		elif git -C "$git_sdk_path" rev-parse --quiet --verify HEAD:usr/i686-pc-msys 2>/dev/null
 		then
 			architecture=i686
+		elif git -C "$git_sdk_path" rev-parse --quiet --verify HEAD:usr/x86_64-pc-cygwin 2>/dev/null
+		then
+			architecture=x86_64
 		elif git -C "$git_sdk_path" rev-parse --quiet --verify HEAD:usr/x86_64-pc-msys 2>/dev/null
 		then
 			architecture=x86_64