[Pkg-octave-commit] [SCM] octave branch, master, updated. 2ecbaa0375353921ac971b4af5a29887b828a0e1

[Thomas Weber]

tags 541444 pending
thanks

The following commit has been merged in the master branch:
commit 9a77b22e7c8e70f7d6612e8a8f4c6136efe4f83d
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat Aug 22 13:18:32 2009 +0200

    Go back to unversioned dependencies on gcc, g++ and gfortran
    
    Bug fix for 541444, #540455. We override the value of FLIBS and drop the
    linker paths containing the compiler version.

diff --git a/debian/changelog b/debian/changelog
index 6251faa..497ca18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ octave3.2 (3.2.0-3) UNRELEASED; urgency=low
   * Bump standards version to 3.8.2, no changes needed
   * Add ${misc:Depends} to all Depends: lines in debian/in/control, thanks
     lintian.
+  * Pass explicit FLIBS to ./configure, to avoid a library path with an
+    explicit compiler path in mkoctfile. This allows us to depend on gcc and
+    friends without a version (closes: #541444, #540455). Consequently, drop
+    the explicit dependencies from debian/in/control and debian/rules.
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 20 Jun 2009 19:16:45 +0200
 
diff --git a/debian/in/control b/debian/in/control
index 8a13eac..fe73a8d 100644
--- a/debian/in/control
+++ b/debian/in/control
@@ -104,11 +104,10 @@ Description: HTML documentation on the GNU Octave language ([V_3_0:3.0:][V_3_2:3
 
 Package: octave[V_3_0:3.0:][V_3_2:3.2:]-headers
 Architecture: any
-Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (= ${binary:Version}), ${gcc:Depends}, ${misc:Depends},
+Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (= ${binary:Version}), ${misc:Depends},
  libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
  | libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5) | libhdf5-openmpi-dev (>= 1.6.5),
- libblas-dev, liblapack-dev, libfftw3-dev,
- f2c [m68k]
+ libblas-dev, liblapack-dev, libfftw3-dev, gfortran, gcc, g++, f2c [m68k]
 Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):][V_3_2:, octave3.1-headers:]
 Provides: octave-headers[V_3_2:, octave3.1-headers:]
 Replaces: octave-headers[V_3_2:, octave3.1-headers:]
diff --git a/debian/rules b/debian/rules
index 62e02db..b779562 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,21 +22,6 @@ major       	:= $(shell echo $(version) | perl -nle \
 PACKAGEVER	:= $(shell echo $(PACKAGE) | \
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
 
-GCCCURVER	:= $(shell gcc --version | perl -ne '/Debian (.*)-/; print "$$1"; last')
-GCCMAJOR	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[0]')
-GCCMINOR	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[1]')
-GCCMICRO	:= $(shell echo "$(GCCCURVER)" | perl -nle '@v=split(/\./);print $$v[2]')
-GCCDEPS		:= $(shell perl -e '										\
-	print join (", ", map {											\
-		join (", ", ("$$_ (>= 4:$(GCCMAJOR).$(GCCMINOR))",						\
-			"$$_ (<< 4:$(GCCMAJOR)." . ($(GCCMINOR)+1) . ")",					\
-			"$$_-$(GCCMAJOR).$(GCCMINOR) (>= $(GCCCURVER))",					\
-			"$$_-$(GCCMAJOR).$(GCCMINOR) (<< $(GCCMAJOR).$(GCCMINOR)." . ($(GCCMICRO)+1) .")"))	\
-	} ("gcc", "g++", "gfortran"))')
-
-hack:
-	@echo "$(GCCDEPS)"
-
 ifeq ($(major),3.2)
 priority	:= 80
 else
@@ -92,7 +77,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 f77_compiler	= gfortran
 fc_flag		=
-fc_libs		=
+fc_libs		= "-lgfortranbegin -lgfortran"
 compilerflags	= -O2 -g
 
 # default to blas, atlas can overload where available (see README.Atlas)
@@ -106,12 +91,10 @@ ifeq ($(DEB_BUILD_ARCH),arm)
 # edd 25 Aug 2002  arm does not have atlas
 compilerflags	= -O0 -g0
 atlas		= --without-blas
-c_compiler	= gcc-4.1
-cxx_compiler	= g++-4.1
-else
+endif
+
 c_compiler	= gcc
 cxx_compiler	= g++
-endif
 
 #export DH_VERBOSE=1
 
@@ -481,7 +464,6 @@ endif
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a -l/usr/lib/octave-$(version)
-	echo 'gcc:Depends=$(GCCDEPS)' >> $(debbase)/$(PACKAGE)-headers.substvars
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a

-- 
octave