diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-12-04 05:11:43 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-12-04 05:11:43 (GMT) |
| commit | bdb7e57d89472039172837381fc533d762d31423 (patch) | |
| tree | ac53fddb2718fe8406bac9ceaedd58161186969f | |
| parent | 50ee67f88b207cd5acc5e105fc6fe7ac64bbe966 (diff) | |
| parent | 8fe0680679e77738d1b30af417dcc2dce63ef67b (diff) | |
| download | mxe-bdb7e57d89472039172837381fc533d762d31423.zip mxe-bdb7e57d89472039172837381fc533d762d31423.tar.gz mxe-bdb7e57d89472039172837381fc533d762d31423.tar.bz2 | |
Merge pull request #1016 from LuaAndC/patch-tool-improvements
Patch tool improvements
| -rw-r--r-- | src/gcc-1.patch | 3 | ||||
| -rwxr-xr-x | tools/patch-tool-mxe | 22 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/gcc-1.patch b/src/gcc-1.patch index a72269e..ceeb45f 100644 --- a/src/gcc-1.patch +++ b/src/gcc-1.patch @@ -48,7 +48,7 @@ diff --git a/gcc/config/i386/adxintrin.h b/gcc/config/i386/adxintrin.h index dd2a26c..2e680b3 100644 --- a/gcc/config/i386/adxintrin.h +++ b/gcc/config/i386/adxintrin.h -@@ -28,6 +28,10 @@ +@@ -28,5 +28,9 @@ #ifndef _ADXINTRIN_H_INCLUDED #define _ADXINTRIN_H_INCLUDED @@ -58,7 +58,6 @@ index dd2a26c..2e680b3 100644 + extern __inline unsigned char __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _subborrow_u32 (unsigned char __CF, unsigned int __X, @@ -78,4 +82,8 @@ _addcarryx_u64 (unsigned char __CF, unsigned long long __X, } #endif diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index b59b094..10fadfb 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -5,10 +5,7 @@ cmd=$1 pkg=$2 -patch_name=$3 -if [ -z "$patch_name" ]; then - patch_name=1-fixes -fi +patch_name=${3:-1-fixes} setupEnv() { # MXE directory @@ -20,9 +17,6 @@ setupEnv() { mkdir -p ${gitsdir} - # John Doe <John Doe@acme.org> - export author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` - export pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/'` @@ -34,7 +28,7 @@ setupEnv() { sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ sed s/'$(PKG)'/$pkg/;` - export pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ + export pkg_file=`grep '^$(PKG)_FILE\>' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/' | \ sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ @@ -100,8 +94,14 @@ function export_patch { echo '' echo 'Contains ad hoc patches for cross building.' echo '' - git format-patch -p --stdout dist..HEAD | \ - sed 's/^From: .*/From: MXE/g;' + git format-patch \ + --no-numbered \ + -p \ + --no-signature \ + --stdout \ + dist..HEAD | \ + sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' | \ + sed 's/^index .......\.\......../index 0000000..0000000/' ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } @@ -117,7 +117,7 @@ function import_patch { cd $gitsdir/$pkg_subdir && \ cat ${mxedir}/src/${pkg}-${patch_name}.patch | \ sed '/^From/,$ !d' | \ - sed s/'^From: .*'/"From: $author"/'g;' | \ + sed s/'^From: MXE'/"From: fix@me"/'g;' | \ git am --keep-cr && \ echo "Imported ${mxedir}/src/${pkg}-${patch_name}.patch" else |