build fix

3 files changed, 50 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 316d2ed567d6..d7b29025ff8d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Aug 14 17:45:09 UTC 2017
+# Mon Aug 21 17:09:47 UTC 2017
 pkgbase = e1000e-dkms
 	pkgdesc = Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)
 	pkgver = 3.3.5.10
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/e1000/
 	install = e1000e-dkms.install
 	arch = i686
@@ -15,8 +15,10 @@ pkgbase = e1000e-dkms
 	optdepends = linux-lts-headers: build the module against LTS Arch kernel [requires at least one set of kernel headers]
 	source = http://downloads.sourceforge.net/project/e1000/e1000e%20stable/3.3.5.10/e1000e-3.3.5.10.tar.gz
 	source = dkms.conf.in
+	source = build-fix.patch
 	sha256sums = d18ec1ff96f570a732bcec0204478e29427e07ad6354c6d0aedf3fb79314bcad
 	sha256sums = 635b6c312c18db94e852248e0f5a1238e179ef1c0ebba2cdd0983afdb56efaf4
+	sha256sums = d30c5d46d9f9b5e9c7ddcb3bd21303f585e04545571156fe3130d9f72922d0e0
 
 pkgname = e1000e-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index ef6d9899c24b..6a322fc1ccc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=e1000e-dkms
 _modname=e1000e
 pkgver=3.3.5.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel e1000e Ethernet adapter driver (latest version from Intel) (DKMS version)"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -15,9 +15,16 @@ optdepends=('linux-headers: build the module against Arch kernel [requires at le
 install=e1000e-dkms.install
 url='http://sourceforge.net/projects/e1000/'
 source=("http://downloads.sourceforge.net/project/e1000/${_modname}%20stable/${pkgver}/${_modname}-${pkgver}.tar.gz"
-        'dkms.conf.in')
+        'dkms.conf.in'
+        'build-fix.patch')
 sha256sums=('d18ec1ff96f570a732bcec0204478e29427e07ad6354c6d0aedf3fb79314bcad'
-            '635b6c312c18db94e852248e0f5a1238e179ef1c0ebba2cdd0983afdb56efaf4')
+            '635b6c312c18db94e852248e0f5a1238e179ef1c0ebba2cdd0983afdb56efaf4'
+            'd30c5d46d9f9b5e9c7ddcb3bd21303f585e04545571156fe3130d9f72922d0e0')
+
+prepare() {
+  cd ${srcdir}/${_modname}-${pkgver}
+  patch -p1 <"$srcdir"/build-fix.patch
+}
 
 package() {
   cd ${srcdir}/${_modname}-${pkgver}
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 000000000000..4a1cecd9ec56
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,36 @@
+diff -wbBur e1000e-3.3.5.10.org/src/Makefile e1000e-3.3.5.10/src/Makefile
+--- e1000e-3.3.5.10.org/src/Makefile	2017-06-18 11:08:08.000000000 +0300
++++ e1000e-3.3.5.10/src/Makefile	2017-08-21 20:08:41.961879873 +0300
+@@ -76,11 +76,7 @@
+ endif
+ 
+ # Version file Search Path
+-VSP :=  $(KOBJ)/include/generated/utsrelease.h \
+-        $(KOBJ)/include/linux/utsrelease.h \
+-        $(KOBJ)/include/linux/version.h \
+-        $(KOBJ)/include/generated/uapi/linux/version.h \
+-        /boot/vmlinuz.version.h
++VSP :=  $(KOBJ)/include/generated/uapi/linux/version.h
+ 
+ # Config file Search Path
+ CSP :=  $(KOBJ)/include/generated/autoconf.h \
+@@ -124,19 +120,6 @@
+ # we need to know what platform the driver is being built on
+ # some additional features are only built on Intel platforms
+ ARCH := $(shell uname -m | sed 's/i.86/i386/')
+-ifeq ($(ARCH),alpha)
+-  EXTRA_CFLAGS += -ffixed-8 -mno-fp-regs
+-endif
+-ifeq ($(ARCH),x86_64)
+-  EXTRA_CFLAGS += -mcmodel=kernel -mno-red-zone
+-endif
+-ifeq ($(ARCH),ppc)
+-  EXTRA_CFLAGS += -msoft-float
+-endif
+-ifeq ($(ARCH),ppc64)
+-  EXTRA_CFLAGS += -m64 -msoft-float
+-  LDFLAGS += -melf64ppc
+-endif
+ 
+ # extra flags for module builds
+ EXTRA_CFLAGS += -DDRIVER_$(shell echo $(DRIVER_NAME) | tr '[a-z]' '[A-Z]')