[Debian-astro-commits] [iraf] 04/05: Rediff patches

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository iraf.

commit 02babd5f5240ce6d800ec734a5c3483c6ae4eb9f
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Dec 14 16:54:53 2017 +0100

    Rediff patches
    
    Drop Remove-explicit-setting-of-mem_-on-x86_64.patch: <REASON>
    Drop Don-t-link-to-librt.patch: <REASON>
---
 debian/patches/Add-new-architectures.patch         |  4 +--
 debian/patches/Don-t-link-to-librt.patch           | 22 ------------
 ...Remove-explicit-setting-of-mem_-on-x86_64.patch | 41 ----------------------
 .../Use-system-libraries-when-possible.patch       |  2 +-
 debian/patches/series                              |  2 --
 5 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/debian/patches/Add-new-architectures.patch b/debian/patches/Add-new-architectures.patch
index 4ad82d4..fd6dba0 100644
--- a/debian/patches/Add-new-architectures.patch
+++ b/debian/patches/Add-new-architectures.patch
@@ -76,7 +76,7 @@ index 0000000..e14b668
 +	mov	r1, #0         @ 0       --> 2nd arg for sigsetjmp
 +	b	__sigsetjmp    @ call sigsetjmp
 diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
-index 3098425..3677418 100644
+index 2498362..5622730 100644
 --- a/unix/boot/spp/xc.c
 +++ b/unix/boot/spp/xc.c
 @@ -78,7 +78,7 @@ char *fortlib[] = { "-lf2c",			/*  0  (host progs) */
@@ -86,8 +86,8 @@ index 3098425..3677418 100644
 -#ifdef __linux__
 +#if defined (__linux__) || defined (__gnu_hurd__)
  		    "-lpthread",		/*  5  */
- 		    "-lrt",			/*  6  */
  #else
+ 		    "",				/*  5  */
 diff --git a/unix/hlib/irafarch.sh b/unix/hlib/irafarch.sh
 index 483c380..abb33c6 100755
 --- a/unix/hlib/irafarch.sh
diff --git a/debian/patches/Don-t-link-to-librt.patch b/debian/patches/Don-t-link-to-librt.patch
deleted file mode 100644
index c92221f..0000000
--- a/debian/patches/Don-t-link-to-librt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Thu, 14 Dec 2017 08:38:34 +0100
-Subject: Don't link to librt
-
-Directly linking to this library is not needed anymore.
----
- unix/boot/spp/xc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
-index 3677418..b244d7d 100644
---- a/unix/boot/spp/xc.c
-+++ b/unix/boot/spp/xc.c
-@@ -80,7 +80,7 @@ char *fortlib[] = { "-lf2c",			/*  0  (host progs) */
- 		    "-lexpat",			/*  4  */
- #if defined (__linux__) || defined (__gnu_hurd__)
- 		    "-lpthread",		/*  5  */
--		    "-lrt",			/*  6  */
-+		    "",			        /*  6  */
- #else
- 		    "",				/*  5  */
- 		    "",				/*  6  */		    
diff --git a/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch b/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch
deleted file mode 100644
index 2c92cea..0000000
--- a/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Ole Streicher <olebole at debian.org>
-Date: Thu, 14 Dec 2017 13:54:43 +0100
-Subject: Remove explicit setting of mem_ on x86_64
-
-On some platforms (Ubuntu 16.04), this avoids a mysterious linker
-error
-
-```
-/.../ipcmap.x:38:(.text+0x5):
-  relocation truncated to fit: R_X86_64_32 against symbol `mem_'
-  defined in *ABS* section in /tmp/T_xx_dataio.e.12ffky
-```
-
-and it is really not needed to set this at all.
----
- unix/as.linux64/zsvjmp.s | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/unix/as.linux64/zsvjmp.s b/unix/as.linux64/zsvjmp.s
-index f2e4af2..b5813e2 100644
---- a/unix/as.linux64/zsvjmp.s
-+++ b/unix/as.linux64/zsvjmp.s
-@@ -22,18 +22,6 @@
-         .globl	zsvjmp_
- 	.type   zsvjmp_, @function
- 
--	# The following has nothing to do with ZSVJMP, and is included here
--	# only because this assembler module is loaded with every process.
--	# This code sets the value of the symbol MEM (the VOS or Fortran Mem
--	# common) to zero, setting the origin for IRAF pointers to zero
--	# rather than some arbitrary value, and ensuring that the MEM common
--	# is aligned for all datatypes as well as page aligned.  A further
--	# advantage is that references to NULL pointers are likely to cause a
--	# memory violation.
--
--	.globl  mem_
--	mem_   =       0
--
- zsvjmp_:
- 	# %rsi ... &status  %rdi ... &jumpbuf
- 	movq    %rsi, (%rdi)    # store &status in jmpbuf[0]
diff --git a/debian/patches/Use-system-libraries-when-possible.patch b/debian/patches/Use-system-libraries-when-possible.patch
index 5864699..ca2c698 100644
--- a/debian/patches/Use-system-libraries-when-possible.patch
+++ b/debian/patches/Use-system-libraries-when-possible.patch
@@ -51,7 +51,7 @@ index cd5bb0c..1684d2e 100644
  bin$libslalib.a
  bin$libstg.a
 diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
-index 61a3145..3098425 100644
+index 6a31b26..2498362 100644
 --- a/unix/boot/spp/xc.c
 +++ b/unix/boot/spp/xc.c
 @@ -70,7 +70,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index b207ce6..e0f63da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,3 @@ Separate-NOAO-and-dev-packages.patch
 Propagate-CFLAGS-and-debug-flag-to-xc.patch
 Skip-source-dependent-tests.patch
 Add-new-architectures.patch
-Don-t-link-to-librt.patch
-Remove-explicit-setting-of-mem_-on-x86_64.patch

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