[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#801337: cloog: Fix usage of dh_autoreconf



Source: cloog
Version: 0.18.2-1+b2
Severity: normal
Tags: patch

Dear Maintainer,

Although package cloog builds with the usage of autotools-dev debhelper
script, autoreconf is the proper way to reconfigure the package so it
builds.
Also, rebootstrap script is beeing affected by it, since the package needs
to be autoreconf'ed.

The patch attached enables usage of dh-autoreconf instead of
dh_autotools-dev. It actually needs the Makefile.am within isl
subdirectory to be there so it runs with no failures.

I have tested this in ppc64el and amd64 machines.

Thanks and regards.

-- System Information:
Debian Release: 8.0
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: ppc64el (ppc64le)

Kernel: Linux 3.16.0-4-powerpc64le (SMP w/16 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru cloog-0.18.3/debian/changelog cloog-0.18.3/debian/changelog
--- cloog-0.18.3/debian/changelog	2015-04-24 09:21:36.000000000 -0400
+++ cloog-0.18.3/debian/changelog	2015-10-08 14:04:50.000000000 -0400
@@ -1,3 +1,13 @@
+cloog (0.18.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: changed usage of dh_autotools-dev_* to dh_autoreconf
+  * debian/control: included dh-autoreconf as build-dep and removed
+    autotools-dev, since it is already a dependency for dh-autoreconf.
+  * debian/patch: use_autoreconf.patch includes the file Makefile.am 
+
+ -- Fernando Seiti Furusato <ferseiti@br.ibm.com>  Thu, 08 Oct 2015 14:01:38 -0400
+
 cloog (0.18.3-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru cloog-0.18.3/debian/control cloog-0.18.3/debian/control
--- cloog-0.18.3/debian/control	2014-12-04 14:15:33.000000000 -0500
+++ cloog-0.18.3/debian/control	2015-10-08 14:04:28.000000000 -0400
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>, Michael Tautschnig <mt@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev,
+Build-Depends: debhelper (>= 5), dh-autoreconf,
   libisl-dev (>= 0.14), libgmp-dev,
   texinfo, help2man
 # Build-Depends-Indep: libpod-latex-perl | perl (<< 5.17.0) # not needed, no docs built
diff -Nru cloog-0.18.3/debian/patches/series cloog-0.18.3/debian/patches/series
--- cloog-0.18.3/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ cloog-0.18.3/debian/patches/series	2015-10-08 13:58:20.000000000 -0400
@@ -0,0 +1 @@
+use_autoreconf.patch
diff -Nru cloog-0.18.3/debian/patches/use_autoreconf.patch cloog-0.18.3/debian/patches/use_autoreconf.patch
--- cloog-0.18.3/debian/patches/use_autoreconf.patch	1969-12-31 19:00:00.000000000 -0500
+++ cloog-0.18.3/debian/patches/use_autoreconf.patch	2015-10-08 14:01:21.000000000 -0400
@@ -0,0 +1,42 @@
+Description: Use autoreconf to build
+ This package failed to run autoreconf because configure.ac includes isl subdir
+ to its configuration even if it is not used.
+ Solution is to include the Makefile.am that would be downloaded if built from
+ scratch. The file is short.
+Author: Fernando Furusato <ferseiti@br.ibm.com>
+
+--- /dev/null
++++ cloog-0.18.3/isl/interface/Makefile.am
+@@ -0,0 +1,32 @@
++AUTOMAKE_OPTIONS = nostdinc
++
++noinst_PROGRAMS = extract_interface
++
++AM_CXXFLAGS = $(CLANG_CXXFLAGS)
++AM_LDFLAGS = $(CLANG_LDFLAGS)
++
++includes = -I$(top_builddir) -I$(top_srcdir) \
++	-I$(top_builddir)/include -I$(top_srcdir)/include
++
++extract_interface_CPPFLAGS = $(includes)
++extract_interface_SOURCES = \
++	python.h \
++	python.cc \
++	extract_interface.h \
++	extract_interface.cc
++extract_interface_LDADD = \
++	-lclangFrontend -lclangSerialization -lclangParse -lclangSema \
++	$(LIB_CLANG_EDIT) \
++	-lclangAnalysis -lclangAST -lclangLex -lclangBasic -lclangDriver \
++	$(CLANG_LIBS) $(CLANG_LDFLAGS)
++
++test: extract_interface
++	./extract_interface$(EXEEXT) $(includes) $(srcdir)/all.h
++
++isl.py: extract_interface isl.py.top
++	(cat $(srcdir)/isl.py.top; \
++		./extract_interface$(EXEEXT) $(includes) $(srcdir)/all.h) \
++			> isl.py
++
++dist-hook: isl.py
++	cp isl.py $(distdir)/
diff -Nru cloog-0.18.3/debian/rules cloog-0.18.3/debian/rules
--- cloog-0.18.3/debian/rules	2015-04-24 09:17:10.000000000 -0400
+++ cloog-0.18.3/debian/rules	2015-10-08 13:57:13.000000000 -0400
@@ -19,7 +19,7 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	dh_autotools-dev_updateconfig
+	dh_autoreconf
 	chmod +x configure
 	./configure $(CROSS) \
 		--prefix=/usr \
@@ -49,7 +49,7 @@
 	rm -f doc/*.info
 	rm -f cloog-isl-uninstalled.sh *.pc *.pc.in doc/gitversion.texi version.h
 	rm -f config.log config.status
-	dh_autotools-dev_restoreconfig
+	dh_autoreconf_clean
 	dh_clean 
 
 install: build

Reply to: