[packages/lin_tape] - drop fancy innecessary options

baggins baggins at pld-linux.org
Sun Jun 19 17:45:55 CEST 2016


commit e595de87931aaca8ac18851d194223d361d59328
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 19 15:45:31 2016 +0000

    - drop fancy innecessary options

 lin_tape.spec  | 14 ++------------
 no-uname.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 12 deletions(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index 8821943..34af321 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -23,6 +23,7 @@ Patch3:		linux-3.13.patch
 Patch4:		linux-3.19.patch
 Patch5:		linux-4.0.patch
 Patch6:		linux-4.6.patch
+Patch7:		no-uname.patch
 # System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
 URL:		http://www.ibm.com/support/fixcentral/
 BuildRequires:	rpmbuild(macros) >= 1.701
@@ -77,18 +78,7 @@ compatible platforms.\
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%ifarch %{ix86} ia64
-proc="Intel"
-%endif
-%ifarch %{x8664} x32
-proc="AMD"
-%endif
-%ifarch ppc ppc64 powerpc powerpc64
-proc="pSeries"
-%endif
-%ifarch s390 s390x
-proc="zSeries"
-%endif
+%patch7 -p1
 
 install -p %{SOURCE1} .
 
diff --git a/no-uname.patch b/no-uname.patch
new file mode 100644
index 0000000..c3d28b6
--- /dev/null
+++ b/no-uname.patch
@@ -0,0 +1,28 @@
+--- lin_tape-3.0.8/Makefile.orig	2016-06-19 15:38:24.000000000 +0000
++++ lin_tape-3.0.8/Makefile	2016-06-19 15:39:28.228067758 +0000
+@@ -18,25 +18,6 @@
+ lin_tape-objs := join.o lin_tape_scsi_config.o lin_tape_scsi_tape.o lin_tape_scsi_trace.o \
+              lin_tape_ioctl_tape.o lin_tape_ioctl_changer.o lin_tape_extra_ioctl.o
+ 
+-PROC := $(shell uname -m)
+-
+-ifeq ($(PROC), ppc64)
+-EXTRA_CFLAGS += -m64
+-endif
+-
+-ifeq ($(PROC), powerpc64)
+-EXTRA_CFLAGS += -m64
+-endif
+-
+-ifeq ($(PROC), powerpc)
+-EXTRA_CFLAGS += -m64 -msoft-float
+-LDFLAGS += -melf64ppc
+-endif
+-
+-ifeq ($(PROC), x86_64)
+-EXTRA_CFLAGS += -mcmodel=kernel
+-endif
+-
+ VERSION := $(word 1,$(VERSIONRELEASE))
+ RELEASE := $(word 2,$(VERSIONRELEASE))
+ ifeq ($(RELEASE),)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/e595de87931aaca8ac18851d194223d361d59328



More information about the pld-cvs-commit mailing list