[SCM] Image Reduction and Analysis Facility branch, debian, updated. 457b1e7b8f3328a95d279f9c122c33dd1e8ab65c

Ole Streicher debian at liska.ath.cx
Mon Jun 3 14:33:12 UTC 2013


The following commit has been merged in the debian branch:
commit 90c80c8638a3fb994386e924480d448c0bdcdfcb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 3 12:13:26 2013 +0200

    Fix Flags for mkpkg

diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index 8982272..9555fe0 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -226,3 +226,29 @@ Description: Propagate CFLAGS and CC to Makefiles.
  Shared:
  	/bin/mkdir $@
  	chmod 777 $@
+--- a/unix/hlib/mkpkg.inc
++++ b/unix/hlib/mkpkg.inc
+@@ -7,17 +7,17 @@
+ $set	SITEID		= noao		# site name
+ 
+ $ifeq (MACH, freebsd) then
+-$set	XFLAGS		= "-c -w -/m32"	# default XC compile flags
+-$set	XVFLAGS		= "-c -w" -/m32	# VOPS XC compile flags
+-$set	LFLAGS		= "-z -/static -/m32"	# default XC link flags
++$set	XFLAGS		= "-c -w"	# default XC compile flags
++$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
++$set	LFLAGS		= "-z -/static"	# default XC link flags
+ $else $ifeq (MACH, linux) then
+ $set	XFLAGS		= "-c -w"	# default XC compile flags
+ $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
+ $set	LFLAGS		= "-Nz"		# default XC link flags
+ $else $ifeq (MACH, linux64) then
+-$set	XFLAGS		= "-c -w -/g -/m64"	# default XC compile flags
+-$set	XVFLAGS		= "-c -w -/g -/m64"	# VOPS XC compile flags
+-$set	LFLAGS		= "-Nz   -/g -/m64"	# default XC link flags
++$set	XFLAGS		= "-c -w"	# default XC compile flags
++$set	XVFLAGS		= "-c -w"	# VOPS XC compile flags
++$set	LFLAGS		= "-Nz"		# default XC link flags
+ $else $ifeq (MACH, redhat) then
+ $set	XFLAGS		= "-c -w"	# default XC compile flags
+ $set	XVFLAGS		= "-c -w"	# VOPS XC compile flags

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list