[Debian-astro-commits] [iraf] 01/02: Propagate CFLAGS and debug flag to xc
Ole Streicher
olebole at moszumanska.debian.org
Tue Nov 28 15:23:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch master
in repository iraf.
commit d0859c22df4c2d9feaa41f47de6b1365ef6236ae
Author: Ole Streicher <olebole at debian.org>
Date: Tue Nov 28 16:21:40 2017 +0100
Propagate CFLAGS and debug flag to xc
---
.../patches/Adjust-version-number-and-motd.patch | 16 ++-
debian/patches/Fix-f77-script.patch | 21 ----
.../Propagate-CFLAGS-and-debug-flag-to-xc.patch | 111 +++++++++++++++++++++
debian/patches/series | 2 +-
4 files changed, 127 insertions(+), 23 deletions(-)
diff --git a/debian/patches/Adjust-version-number-and-motd.patch b/debian/patches/Adjust-version-number-and-motd.patch
index 40419ad..e7272aa 100644
--- a/debian/patches/Adjust-version-number-and-motd.patch
+++ b/debian/patches/Adjust-version-number-and-motd.patch
@@ -3,10 +3,24 @@ Date: Thu, 23 Nov 2017 23:31:11 +0100
Subject: Adjust version number and motd
---
+ unix/hlib/mkpkg.inc | 2 +-
unix/hlib/motd | 4 +---
unix/hlib/zzsetenv.def | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+diff --git a/unix/hlib/mkpkg.inc b/unix/hlib/mkpkg.inc
+index 4192384..ead98b9 100644
+--- a/unix/hlib/mkpkg.inc
++++ b/unix/hlib/mkpkg.inc
+@@ -4,7 +4,7 @@ $verbose
+
+ $set MACH = $(IRAFARCH) # machine/fpu type
+ $set HOSTID = unix # host system name
+-$set SITEID = noao # site name
++$set SITEID = debian # site name
+
+ $set XFLAGS = "-c -w" # default XC compile flags
+ $set XVFLAGS = "-c -w" # VOPS XC compile flags
diff --git a/unix/hlib/motd b/unix/hlib/motd
index 77d4f03..71fcdcc 100644
--- a/unix/hlib/motd
diff --git a/debian/patches/Fix-f77-script.patch b/debian/patches/Fix-f77-script.patch
deleted file mode 100644
index 943fa27..0000000
--- a/debian/patches/Fix-f77-script.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Wed, 22 Nov 2017 14:58:16 +0100
-Subject: Fix f77 script
-
----
- unix/hlib/f77.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/hlib/f77.sh b/unix/hlib/f77.sh
-index e990e90..6ec5ddd 100755
---- a/unix/hlib/f77.sh
-+++ b/unix/hlib/f77.sh
-@@ -44,7 +44,7 @@ s=/tmp/stderr_$$
- t=/tmp/f77_$$
- #CC=${CC_f2c:-'/usr/bin/cc -m486'}
- CC=${CC_f2c:-'gcc'}
--CFLAGS=${CFLAGS:-"-I${iraf}unix/f2c/libf2c"}
-+CFLAGS+=" -I${iraf}unix/f2c/libf2c"
- EFL=${EFL:-/v/bin/efl}
- EFLFLAGS=${EFLFLAGS:-'system=portable deltastno=10'}
- F2C=${F2C:-/usr/bin/f2c}
diff --git a/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch b/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch
new file mode 100644
index 0000000..e23320b
--- /dev/null
+++ b/debian/patches/Propagate-CFLAGS-and-debug-flag-to-xc.patch
@@ -0,0 +1,111 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 22 Nov 2017 14:58:16 +0100
+Subject: Propagate CFLAGS and debug flag to xc
+
+---
+ Makefile | 2 --
+ unix/hlib/f77.sh | 2 +-
+ unix/hlib/irafuser.sh | 4 ++--
+ unix/hlib/mkpkg.inc | 4 ++--
+ vendor/Makefile | 2 --
+ vendor/libvotable/Makefile | 3 +--
+ 6 files changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f455ba9..b572b4a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,11 +6,9 @@
+ # Compiler Flags.
+
+ RELEASE = v2.16
+-CFLAGS =
+ CDEBUGFLAGS = -O2 -Wall
+ BOOTSTRAPCFLAGS =
+
+-CC = gcc
+ AS = gcc -c -x assembler
+ AR = ar clq
+ CP = cp -p
+diff --git a/unix/hlib/f77.sh b/unix/hlib/f77.sh
+index e990e90..d0fad3e 100755
+--- a/unix/hlib/f77.sh
++++ b/unix/hlib/f77.sh
+@@ -44,7 +44,7 @@ s=/tmp/stderr_$$
+ t=/tmp/f77_$$
+ #CC=${CC_f2c:-'/usr/bin/cc -m486'}
+ CC=${CC_f2c:-'gcc'}
+-CFLAGS=${CFLAGS:-"-I${iraf}unix/f2c/libf2c"}
++CFLAGS="-I${iraf}unix/f2c/libf2c ${XC_CFLAGS}"
+ EFL=${EFL:-/v/bin/efl}
+ EFLFLAGS=${EFLFLAGS:-'system=portable deltastno=10'}
+ F2C=${F2C:-/usr/bin/f2c}
+diff --git a/unix/hlib/irafuser.sh b/unix/hlib/irafuser.sh
+index 78c9ed2..8fd03c3 100755
+--- a/unix/hlib/irafuser.sh
++++ b/unix/hlib/irafuser.sh
+@@ -21,11 +21,11 @@ export F77=$hlib/f77.sh
+ export F2C=$hbin/f2c.e
+ export RANLIB=ranlib
+
+-export XC_CFLAGS="-I${iraf}include ${CFLAGS} -g -Wall -O2"
++export XC_CFLAGS="${CPPFLAGS} ${CFLAGS} -I${iraf}include"
+ export HSI_CF="${XC_CFLAGS}"
+ export HSI_XF="-x -Inolibc -/Wall -/O2"
+ export HSI_FF="-g -DBLD_KERNEL -O2"
+-export HSI_LF=""
++export HSI_LF="${LDFLAGS}"
+ export HSI_F77LIBS=""
+ export HSI_LFLAGS=""
+ export HSI_OSLIBS=""
+diff --git a/unix/hlib/mkpkg.inc b/unix/hlib/mkpkg.inc
+index ead98b9..61a1c5f 100644
+--- a/unix/hlib/mkpkg.inc
++++ b/unix/hlib/mkpkg.inc
+@@ -6,8 +6,8 @@ $set MACH = $(IRAFARCH) # machine/fpu type
+ $set HOSTID = unix # host system name
+ $set SITEID = debian # site name
+
+-$set XFLAGS = "-c -w" # default XC compile flags
+-$set XVFLAGS = "-c -w" # VOPS XC compile flags
++$set XFLAGS = "-c -w -x" # default XC compile flags
++$set XVFLAGS = "-c -w -x" # VOPS XC compile flags
+ $set LFLAGS = "-Nz" # default XC link flags
+
+ $set USE_LIBMAIN = yes # update lib$libmain.o (root object)
+diff --git a/vendor/Makefile b/vendor/Makefile
+index 0779fd6..a8bc19a 100644
+--- a/vendor/Makefile
++++ b/vendor/Makefile
+@@ -17,7 +17,6 @@ INCDIR := ../lib/
+
+
+ # includes, flags and libraries
+-CC = gcc
+ CINCS = -I$(INCDIR) -I./
+ ifeq ($(PLATFORM), "Darwin")
+ ifeq ($(IRAFARCH), "macintel")
+@@ -33,7 +32,6 @@ else
+ endif
+ endif
+
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+ LIBS = -lm -lc -lpthread
+
+
+diff --git a/vendor/libvotable/Makefile b/vendor/libvotable/Makefile
+index 813feb2..62ad0a4 100644
+--- a/vendor/libvotable/Makefile
++++ b/vendor/libvotable/Makefile
+@@ -20,10 +20,9 @@ SHAREDLIB = $(LIBDIR)/$(LIBBASE).so.$(VERSION)
+
+
+ # includes, flags and libraries
+-CC = gcc
+ CINCS = -I$(INCDIR) -I. -I../../include
+
+-CFLAGS = -g -Wall $(CARCH) $(CINCS) -L./ -DHAVE_CFITSIO
++CFLAGS := $(CFLAGS) $(CARCH) $(CINCS) -L./ -DHAVE_CFITSIO
+ CLIBS = -lm -lc -lpthread -lcfitsio
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e5cdbae..620f00b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,7 @@
Use-system-libraries-when-possible.patch
Adjust-version-number-and-motd.patch
Allow-plus-sign-in-build-path.patch
-Fix-f77-script.patch
Don-t-call-back-home-on-start.patch
Make-the-installation-FHS-conform.patch
Separate-NOAO-and-dev-packages.patch
+Propagate-CFLAGS-and-debug-flag-to-xc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/iraf.git
More information about the Debian-astro-commits
mailing list