[openfoam] 02/03: Remove 64bit-specific flags.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository openfoam.

commit 394200432d0ceaf3734449a58a83238744706e9e
Author: Anton Gladky <gladk at debian.org>
Date:   Mon Oct 10 17:14:53 2016 +0200

    Remove 64bit-specific flags.
---
 debian/patches/30_hardening.patch | 26 ++++++++++++++++----------
 debian/rules                      |  9 +++++----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/debian/patches/30_hardening.patch b/debian/patches/30_hardening.patch
index 0156fe2..12dbb65 100644
--- a/debian/patches/30_hardening.patch
+++ b/debian/patches/30_hardening.patch
@@ -2,23 +2,26 @@ Description: Use hardening flags
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2016-09-28
 
-Index: OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c
+Index: openfoam/wmake/rules/linux64Gcc/c
 ===================================================================
---- OpenFOAM-dev-version-4.0.orig/wmake/rules/linux64Gcc/c
-+++ OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c
-@@ -1,6 +1,6 @@
+--- openfoam.orig/wmake/rules/linux64Gcc/c
++++ openfoam/wmake/rules/linux64Gcc/c
+@@ -1,8 +1,8 @@
  SUFFIXES += .c
  
 -cWARN        = -Wall
 +cWARN        = -Wall $(shell dpkg-buildflags --get CFLAGS)
  
- cc          = gcc -m64
+-cc          = gcc -m64
++cc          = gcc
  
-Index: OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c++
+ include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+ 
+Index: openfoam/wmake/rules/linux64Gcc/c++
 ===================================================================
---- OpenFOAM-dev-version-4.0.orig/wmake/rules/linux64Gcc/c++
-+++ OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c++
-@@ -1,9 +1,9 @@
+--- openfoam.orig/wmake/rules/linux64Gcc/c++
++++ openfoam/wmake/rules/linux64Gcc/c++
+@@ -1,11 +1,11 @@
  SUFFIXES += .C
  
 -c++WARN     = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof
@@ -28,5 +31,8 @@ Index: OpenFOAM-dev-version-4.0/wmake/rules/linux64Gcc/c++
 -c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
 +c++LESSWARN = 
  
- CC          = g++ -std=c++0x -m64
+-CC          = g++ -std=c++0x -m64
++CC          = g++ -std=c++0x
+ 
+ include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
  
diff --git a/debian/rules b/debian/rules
index 905c10f..285987d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ export FOAM_RUN=$(CURDIR)/run
 export FOAM_SITE_APPBIN=$(CURDIR)/platforms/linux64Gcc51/bin
 export FOAM_SITE_LIBBIN=$(CURDIR)/platforms/linux64Gcc51/lib
 export FOAM_SRC=$(CURDIR)/src
+export FOAM_ETC=$(CURDIR)/etc
 export FOAM_USER_APPBIN=$(CURDIR)/platforms/linux64Gcc51/bin
 export FOAM_USER_LIBBIN=$(CURDIR)/platforms/linux64Gcc51/lib
 export MANPATH=$(CURDIR)/platforms/linux64Gcc/openmpi-1.6.5/share/man
@@ -29,9 +30,9 @@ export WM_COMPILER=Gcc
 export WM_COMPILER_LIB_ARCH=64
 export WM_COMPILE_OPTION=Opt
 export WM_CXX=g++
-export WM_CXXFLAGS=-m64 -fPIC -I/usr/include/openmpi
+export WM_CXXFLAGS=-fPIC -I/usr/include/openmpi
 export WM_DIR=$(CURDIR)/wmake
-export WM_LDFLAGS=-m64 -I/usr/include/openmpi
+export WM_LDFLAGS=-I/usr/include/openmpi
 export WM_LINK_LANGUAGE=c++
 export WM_OSTYPE=POSIX
 export WM_OPTIONS=linux64Gcc51
@@ -40,7 +41,7 @@ export WM_PROJECT=OpenFOAM
 export WM_PROJECT_DIR=$(CURDIR)
 export WM_PROJECT_INST_DIR=$(CURDIR)/debian/tmp/usr
 export WM_PROJECT_USER_DIR=$(CURDIR)/debian/tmp
-export WM_PROJECT_VERSION=3.0.x
+export WM_PROJECT_VERSION=4.0
 export gperftools_install=$(CURDIR)/platforms/linux64Gcc
 export WM_MPLIB=SYSTEMOPENMPI
 unexport FOAMY_HEX_MESH
@@ -56,4 +57,4 @@ export LD_LIBRARY_PATH:=$(CURDIR)/platforms/linux64Gcc51/lib/openmpi-system:/usr
 
 override_dh_auto_build:
 	cd $(CURDIR)/debian/manpage ; python3 gen_man.py
-	PATH=$(PATH):$(CURDIR)/wmake/ ./Allwmake -j$(NUMJOBS)
+	PATH=$(PATH):$(CURDIR)/wmake/:$(CURDIR)/etc ./Allwmake -j$(NUMJOBS)

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