[eso-midas] 01/06: (Hopefully) fix build problems on Launchpad

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit 1700d9856d80c1d3cafaf367396afc6d35b06e44
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 22 17:53:46 2014 +0200

    (Hopefully) fix build problems on Launchpad
---
 debian/patches/propagate_buildflags.patch | 27 --------------------
 debian/patches/setup-debian.patch         | 41 +++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index 0aa9294..2eaccbd 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -708,33 +708,6 @@ Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
  		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
  		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
  		  $(XMINC)    $(X11INC)
---- a/install/unix/install1
-+++ b/install/unix/install1
-@@ -331,12 +331,12 @@
- # 64 bit compiler
- else
-    echo installing Midas on a 64 bit system
--   MACH="-m64"
--   EO="-Z"
-+   MACH=" "
-+   EO=" "
- fi
-  
- ed_moptions add "F77=gfortran $MACH" >/dev/null
--ed_moptions add "LD77_CMD=gfortran $MACH"  >/dev/null
-+ed_moptions add "LD77_CMD=gfortran $MACH $LDFLAGS"  >/dev/null
- ed_moptions add "E_OPT= $EO"  >/dev/null
- 
- 
-@@ -614,7 +614,7 @@
-   x11incl="found"
- else
-   ed_moptions delete X11INC >/dev/null
--  x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
-+  x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
-   for dir in $x11inclpth
-   do
-     if [ ! -d $dir ]; then
 --- a/applic/general/etc/makefile
 +++ b/applic/general/etc/makefile
 @@ -16,7 +16,7 @@
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index 8a31a0e..0c8760f 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -16,10 +16,8 @@ Description: Debian specific changes
  elif [ "$machine" = "x86_64" ]; then
 --- /dev/null
 +++ b/install/unix/systems/Debian/make_options
-@@ -0,0 +1,10 @@
+@@ -0,0 +1,8 @@
 +CC=gcc
-+LDCC=gcc $(LDFLAGS)
-+LD77_CMD=gfortran $(LDFLAGS)
 +F_OPT=-O -fPIC
 +C_OPT=-O -fPIC
 +SYS=-DLinuxAMD64 -DGCC
@@ -43,14 +41,31 @@ Description: Debian specific changes
 +debugger=gdb
 +ps_print="lpr -h -P"
 +ascii_print="lpr -h -P"
---- a/install/unix/ed_moptions
-+++ b/install/unix/ed_moptions
-@@ -51,7 +51,7 @@
- op=$1
- key=`echo $2 | awk -F= '{print $1}'`
- options=`echo $2 | sed 's/^'$key'=//'`
--options=`eval echo $options`
-+options=`eval echo ${options:-""}`
- oldoptions=""
+--- a/install/unix/install1
++++ b/install/unix/install1
+@@ -331,12 +331,13 @@
+ # 64 bit compiler
+ else
+    echo installing Midas on a 64 bit system
+-   MACH="-m64"
+-   EO="-Z"
++   MACH=" "
++   EO=" "
+ fi
+  
+ ed_moptions add "F77=gfortran $MACH" >/dev/null
+-ed_moptions add "LD77_CMD=gfortran $MACH"  >/dev/null
++ed_moptions add "LD77_CMD=gfortran $MACH $LDFLAGS"  >/dev/null
++ed_moptions add "LDCC=gcc $LDFLAGS"  >/dev/null
+ ed_moptions add "E_OPT= $EO"  >/dev/null
  
- if [ -f $file ]; then
+ 
+@@ -614,7 +614,7 @@
+   x11incl="found"
+ else
+   ed_moptions delete X11INC >/dev/null
+-  x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
++  x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
+   for dir in $x11inclpth
+   do
+     if [ ! -d $dir ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git