Package: opensm
Version: 3.2.6-20090317-2.1
Severity: normal
Tags: patch
User: [email protected]
Usertags: ppc64el
User: [email protected]
Usertags: autoreconf

Dear Maintainer,

I would like to have support for the new architecture ppc64el on the opensm
package, since we are enabling OFED for Debian/ppc64el. In order to do so, I
created a patch that do the following:

a) Mark ppc64el as a buildable binary packages
b) Run autoreconf to fix autotool files

After doing these changes, I found that opensm has duplicated headers in
complib/Makefile.am which cause the install to fail, so, I generated a dpatch
to fix it. (This was my first time using dpatch, so, pardon me if I make some
newbie mistake.)

Thank you,
Breno

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: ppc64el (ppc64le)

Kernel: Linux 3.13-1-powerpc64le (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: opensm/new/opensm-3.2.6-20090317/debian/control
===================================================================
--- opensm.orig/new/opensm-3.2.6-20090317/debian/control	2014-06-16 20:48:03.000000000 +0000
+++ opensm/new/opensm-3.2.6-20090317/debian/control	2014-06-16 20:48:52.000000000 +0000
@@ -8,7 +8,7 @@
 Homepage: http://www.openfabrics.org
 
 Package: opensm
-Architecture: i386 ia64 amd64 powerpc
+Architecture: i386 ia64 amd64 powerpc ppc64el
 Depends: ${misc:Depends}, libopensm2 (= ${binary:Version}), ${shlibs:Depends}, infiniband-diags
 Description: An Infiniband subnet manager
  OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
@@ -17,13 +17,13 @@
 
 Package: opensm-doc
 Section: doc
-Architecture: i386 ia64 amd64 powerpc
+Architecture: i386 ia64 amd64 powerpc ppc64el
 Depends: ${misc:Depends}
 Description: Documentation for opensm
  Documentation for the opensm Infiniband subnet manager.
 
 Package: libopensm2
-Architecture: i386 ia64 amd64 powerpc
+Architecture: i386 ia64 amd64 powerpc ppc64el
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Infiniband subnet manager libraries
  OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
@@ -35,7 +35,7 @@
 
 Package: libopensm2-dev
 Section: libdevel
-Architecture: i386 ia64 amd64 powerpc
+Architecture: i386 ia64 amd64 powerpc ppc64el
 Depends: libopensm2  (= ${binary:Version}), ${misc:Depends}
 Description: Header files for compiling against libopensm
  OpenSM provides an implementation of an Infiniband Subnet Manager (SM) and
Index: opensm/new/opensm-3.2.6-20090317/debian/patches/00list
===================================================================
--- opensm.orig/new/opensm-3.2.6-20090317/debian/patches/00list	2014-06-16 20:48:03.000000000 +0000
+++ opensm/new/opensm-3.2.6-20090317/debian/patches/00list	2014-06-16 20:49:18.000000000 +0000
@@ -1 +1,2 @@
 01_gcc_4.4_else_in_place_elif
+02_remove_duplicated_entries.dpatch
Index: opensm/new/opensm-3.2.6-20090317/debian/patches/02_remove_duplicated_entries.dpatch
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ opensm/new/opensm-3.2.6-20090317/debian/patches/02_remove_duplicated_entries.dpatch	2014-06-16 20:49:05.000000000 +0000
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_duplicated.dpatch by  <root@localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' opensm-3.2.6-20090317~/complib/Makefile.am opensm-3.2.6-20090317/complib/Makefile.am
+--- opensm-3.2.6-20090317~/complib/Makefile.am	2014-06-16 20:02:31.000000000 +0000
++++ opensm-3.2.6-20090317/complib/Makefile.am	2014-06-16 20:11:06.000000000 +0000
+@@ -70,11 +70,6 @@
+ 	$(srcdir)/../include/complib/cl_timer_osd.h \
+ 	$(srcdir)/../include/complib/cl_types.h \
+ 	$(srcdir)/../include/complib/cl_types_osd.h \
+-	$(srcdir)/../include/complib/cl_threadpool.h \
+-	$(srcdir)/../include/complib/cl_timer.h \
+-	$(srcdir)/../include/complib/cl_timer_osd.h \
+-	$(srcdir)/../include/complib/cl_types.h \
+-	$(srcdir)/../include/complib/cl_types_osd.h \
+ 	$(srcdir)/../include/complib/cl_vector.h
+ 
+ # headers are distributed as part of the include dir
Index: opensm/new/opensm-3.2.6-20090317/debian/rules
===================================================================
--- opensm.orig/new/opensm-3.2.6-20090317/debian/rules	2014-06-16 20:48:03.000000000 +0000
+++ opensm/new/opensm-3.2.6-20090317/debian/rules	2014-06-16 20:49:49.000000000 +0000
@@ -20,9 +20,14 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
 
+autoreconf-stamp:
+	dh_autoreconf
+	touch autoreconf-stamp
 
-config.status: patch configure
+config.status: patch configure autoreconf-stamp
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" \
@@ -43,7 +48,9 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
+	dh_autoreconf_clean
 	rm -f build-stamp 
+	rm -f autoreconf-stamp
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean

Reply via email to