[petsc] 03/08: remove C language references in paths and configuration

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch master
in repository petsc.

commit 82eea354c48c6b8a1919681fd7e634e0b887cdf4
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Oct 4 13:07:16 2015 +0800

    remove C language references in paths and configuration
    
    Upstream advises that the default build supports both C and C++ usage.
    The configure option --with-clanguage=C++ --with-c-support is
    therefore redundant.
    
    Likewise there is no need to embed -cxx- (or -c-) into the PETSc
    library path.
---
 debian/README.Debian              |  8 ++++----
 debian/libpetsc3.6.1-dbg.postinst |  2 +-
 debian/libpetsc3.6.1-dev.postinst |  2 +-
 debian/rules                      | 10 +++++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 9e6a726..9d56060 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -14,9 +14,9 @@ directories are in petsc3.6.1-doc.
 The preferred PETSc installation is located at /usr/lib/petsc. This is a symlink
 to the actual installation, managed by Debian alternatives (see below). The
 standard installation is located at 
-  /usr/lib/petscdir/<PETSC_VERSION>/<arch>-cxx-opt
+  /usr/lib/petscdir/<PETSC_VERSION>/<arch>
 e.g.
-  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu-cxx-opt
+  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu
 
 With libpetsc3.6.1-dev installed, you can build programs against it two ways:
 
@@ -54,13 +54,13 @@ promise I'll try to fix it.
 DEBUGGING LIBRARY
 
 With libpetsc3.6.1-dbg installed, a debug version is available at
-  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu-cxx-debug
+  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu-debug
 
 This library includes unstripped symbols and also has internal PETSc debugging
 switched on. It may be accessed
 1) by setting PETSC_DIR
 2) via the pkg-config file in
-  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu-cxx-debug/lib/pkgconfig
+  /usr/lib/petscdir/3.6.1/x86_64-linux-gnu-debug/lib/pkgconfig
 3) or by configuring as preferred alternative with update-alternatives.
 
 REPORTING BUGS and BUILDING FROM SOURCE
diff --git a/debian/libpetsc3.6.1-dbg.postinst b/debian/libpetsc3.6.1-dbg.postinst
index a2bb5ed..90f1293 100644
--- a/debian/libpetsc3.6.1-dbg.postinst
+++ b/debian/libpetsc3.6.1-dbg.postinst
@@ -3,7 +3,7 @@
 DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
 
 PETSC_VERSION=__PETSC_VERSION__
-PETSC_ARCH=${DEB_HOST_MULTIARCH}-cxx-debug
+PETSC_ARCH=${DEB_HOST_MULTIARCH}-debug
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
diff --git a/debian/libpetsc3.6.1-dev.postinst b/debian/libpetsc3.6.1-dev.postinst
index 002dc63..544dd1e 100644
--- a/debian/libpetsc3.6.1-dev.postinst
+++ b/debian/libpetsc3.6.1-dev.postinst
@@ -3,7 +3,7 @@
 DEB_HOST_MULTIARCH=__DEB_HOST_MULTIARCH__
 
 PETSC_VERSION=__PETSC_VERSION__
-PETSC_ARCH=${DEB_HOST_MULTIARCH}-cxx-opt
+PETSC_ARCH=${DEB_HOST_MULTIARCH}
 
 # Make alternatives links
 if [ "$1" = "configure" ]; then
diff --git a/debian/rules b/debian/rules
index 707b411..9be09d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,8 @@ PETSC_MPI_DIR=/usr/lib/$(PETSC_MPI)
 
 PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi)
 
-PETSC_BUILD_DIR=$(PETSC_ARCH)-cxx-opt
-PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-cxx-debug
+PETSC_BUILD_DIR=$(PETSC_ARCH)
+PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-debug
 
 # PETSC_VERSION is used for the package names, library sonames, and
 # /usr/lib/petscdir subdirectory names.
@@ -61,8 +61,8 @@ PETSC_DOC_PACKAGE=$(PETSC_NAME)-doc
 
 # install into /usr/lib/petscdir rather than /usr/lib/petsc 
 # to allow /usr/lib/petsc to be configured by alternatives
-PETSC_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-opt
-PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-debug
+PETSC_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)
+PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-debug
 
 PACKAGE_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)
 PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)
@@ -70,7 +70,7 @@ PACKAGE_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-dbg
 PACKAGE_DEBUG_INSTALL_DIR=$(PACKAGE_DEBUG_INSTALL_BASEDIR)/$(PETSC_DIR_DEBUG_PREFIX)
 
 CONFIGURATION_OPTIONS=--with-shared-libraries \
-	  --useThreads 0 --with-clanguage=C++ --with-c-support \
+	  --useThreads 0 \
 	  --with-fortran-interfaces=1 \
 	  --with-mpi-dir=$(PETSC_MPI_DIR) \
 	  --with-blas-lib=-lblas --with-lapack-lib=-llapack \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git