makefile gcc version autodetect

3 files changed, 23 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94cc90974083..288a293c49a6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = udefrag
 	pkgdesc = Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS filesystem
 	pkgver = 5.0.0AB.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 	arch = x86_64
 	license = GPL
@@ -11,7 +11,7 @@ pkgbase = udefrag
 	source = http://jp-andre.pagesperso-orange.fr/ultradefrag-5.0.0AB.7.zip
 	source = udefrag.patch
 	md5sums = 20cdd938bed3efa5161aefc0ad08ba00
-	md5sums = f34736c6b3baa2ab05bfc043f29c473b
+	md5sums = 09eef7f045ea84e994f81cca88ae7f33
 
 pkgname = udefrag
 
diff --git a/PKGBUILD b/PKGBUILD
index 02b2b0ef9995..a8368ce58550 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
+# Maintainer: frimen <frimen.c@gmail.com>
 # Contributor: 100best
 
 pkgname=udefrag
 pkgver=5.0.0AB.7
-pkgrel=2
-pkgdesc="Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS 
+pkgrel=3
+pkgdesc="Ultradefrag 5.0 console for GNU/Linux to defragment a NTFS
 filesystem"
 url="http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
 arch=('x86_64')
@@ -12,7 +13,7 @@ makedepends=('unzip')
 depends=('ncurses' 'ntfs-3g')
 source=('http://jp-andre.pagesperso-orange.fr/ultradefrag-5.0.0AB.7.zip' 'udefrag.patch')
 md5sums=('20cdd938bed3efa5161aefc0ad08ba00'
-         'f34736c6b3baa2ab05bfc043f29c473b')
+         '09eef7f045ea84e994f81cca88ae7f33')
 
 prepare() {
   patch -p 1 -i udefrag.patch
@@ -24,7 +25,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/ultradefrag-5.0.0AB.7/src 
+  cd $srcdir/ultradefrag-5.0.0AB.7/src
   mkdir -p $pkgdir/usr/bin
   cp udefrag $pkgdir/usr/bin
 }
diff --git a/udefrag.patch b/udefrag.patch
index bfb3f192f89c..2aefc17336d1 100644
--- a/udefrag.patch
+++ b/udefrag.patch
@@ -1,24 +1,31 @@
-diff -aur ultradefrag-5.0.0AB.7.pristine/ultradefrag-5.0.0AB.7/src/Makefile ultradefrag-5.0.0AB.7.new/ultradefrag-5.0.0AB.7/src/Makefile
---- ultradefrag-5.0.0AB.7.pristine/ultradefrag-5.0.0AB.7/src/Makefile	2011-11-24 02:57:55.000000000 -0800
-+++ ultradefrag-5.0.0AB.7.new/ultradefrag-5.0.0AB.7/src/Makefile	2017-01-12 14:57:23.060117185 -0800
-@@ -24,7 +24,7 @@
+diff -ura udefrag_original/ultradefrag-5.0.0AB.7/src/Makefile udefrag_patch/ultradefrag-5.0.0AB.7/src/Makefile
+--- udefrag_original/ultradefrag-5.0.0AB.7/src/Makefile	2011-11-24 14:57:55.032940368 +0400
++++ udefrag_patch/ultradefrag-5.0.0AB.7/src/Makefile	2017-08-25 16:46:09.772756287 +0300
+@@ -18,13 +18,14 @@
+ % : %.s
+ 
+ GCC=gcc
++GCC_VERSION=$(shell expr `$(GCC) -dumpversion`)
+ LD=ld
+ AR=ar
+ INCL=-I/usr/sparc-include -Iinclude
  COPT=-DPPGC=1 -O2
  GCCOPT=-DPPGC=1 -O2
  LIB1=/usr/lib64
 -LIB2=/usr/lib/gcc/x86_64-redhat-linux/4.6.0
-+LIB2=/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.1
++LIB2=/usr/lib/gcc/x86_64-pc-linux-gnu/$(GCC_VERSION)
  NTFSLIB=/lib64/libntfs-3g.so.*.0.0
  
  A=console.a udefrag.a zenwinx.a wincalls.a
-diff -aur ultradefrag-5.0.0AB.7.pristine/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c ultradefrag-5.0.0AB.7.new/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c
---- ultradefrag-5.0.0AB.7.pristine/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2011-11-26 05:56:37.000000000 -0800
-+++ ultradefrag-5.0.0AB.7.new/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2017-01-12 14:47:04.759889749 -0800
+diff -ura udefrag_original/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c udefrag_patch/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c
+--- udefrag_original/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2011-11-26 17:56:37.032940368 +0400
++++ udefrag_patch/ultradefrag-5.0.0AB.7/src/wincalls/ntfs-3g.c	2017-08-25 16:31:08.046697138 +0300
 @@ -144,7 +144,7 @@
  	ntfs_volume *vol;
  
  	if (do_nothing)
 -		vol = ntfs_mount(device,MS_RDONLY);
-+		vol = ntfs_mount(device,"MS_RDONLY");
++		vol = ntfs_mount(device, "MS_RDONLY");
  	else
  		vol = ntfs_mount(device,0);
  #ifdef NVolSetNoFixupWarn