[med-svn] [fis-gtm] 03/04: Patch maintenance
Amul Shah
tuskentower-guest at moszumanska.debian.org
Thu Aug 28 04:13:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
tuskentower-guest pushed a commit to branch master
in repository fis-gtm.
commit 90715ea92e9e863c623f812060ebd43e22f3ea2b
Author: Amul Shah <e1020505 at instance1.(none)>
Date: Wed Aug 27 23:37:10 2014 -0400
Patch maintenance
Refresh existing DESTDIR patches
Remove outdate install_help_files.patch
Backport two patches, one to amend the README and the other to make 32bit
compiles i586.
---
debian/patches/install_help_files.patch | 14 -------------
debian/patches/series | 4 +++-
...estdir_Refactor-object-file-source-name-storage | 22 ++++++++++----------
...pport-source-to-object-compilation-in-a-DESTDIR | 4 ++--
debian/patches/up_gtm_destdir_substitution | 10 ++++-----
debian/patches/upstream_backport_README_change | 24 ++++++++++++++++++++++
.../upstream_backport_i586_default_32bit_linux | 21 +++++++++++++++++++
7 files changed, 66 insertions(+), 33 deletions(-)
diff --git a/debian/patches/install_help_files.patch b/debian/patches/install_help_files.patch
deleted file mode 100644
index 873667d..0000000
--- a/debian/patches/install_help_files.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Brad King <brad.king at kitware.com>
-Last-Update: Fri, 20 Dec 2013 14:24:12 -0500
-Description: Install help files properly
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -759,6 +759,7 @@ Halt")
- )
- list(APPEND files_to_place ${help}help.dat)
- install(FILES ${GTM_BINARY_DIR}/${help}help.dat DESTINATION ${GTM_INSTALL_DIR})
-+ install(FILES ${GTM_BINARY_DIR}/${help}help.gld DESTINATION ${GTM_INSTALL_DIR})
- endforeach()
- #-----------------------------------------------------------------------------
-
diff --git a/debian/patches/series b/debian/patches/series
index d87d635..3d69340 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
up_gtm_destdir_substitution
up_gtm_destdir_Refactor-object-file-source-name-storage
up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
-install_help_files.patch
+upstream_backport_i586_default_32bit_linux
+upstream_backport_README_change
+
diff --git a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage b/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
index f252d97..1c0660d 100644
--- a/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
+++ b/debian/patches/up_gtm_destdir_Refactor-object-file-source-name-storage
@@ -16,8 +16,8 @@ to be modified before storage in the object file.
create mode 100644 sr_unix/obj_source.c
create mode 100644 sr_unix/obj_source.h
---- fis-gtm-V6.0-003.orig/sr_i386/obj_file.c
-+++ fis-gtm-V6.0-003/sr_i386/obj_file.c
+--- a/sr_i386/obj_file.c
++++ b/sr_i386/obj_file.c
@@ -30,6 +30,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -40,8 +40,8 @@ to be modified before storage in the object file.
/* comp_lits aligns the start of routine_name on a NATIVE_WSIZE boundary.*/
padsize = PADLEN(offset, NATIVE_WSIZE);
if (padsize)
---- fis-gtm-V6.0-003.orig/sr_unix/comp_lits.c
-+++ fis-gtm-V6.0-003/sr_unix/comp_lits.c
+--- a/sr_unix/comp_lits.c
++++ b/sr_unix/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
@@ -70,8 +70,8 @@ to be modified before storage in the object file.
offset += PADLEN(offset, NATIVE_WSIZE);
rhead->routine_name.len = routine_name.len;
rhead->routine_name.addr = (char *)offset;
---- fis-gtm-V6.0-003.orig/sr_unix/obj_file.c
-+++ fis-gtm-V6.0-003/sr_unix/obj_file.c
+--- a/sr_unix/obj_file.c
++++ b/sr_unix/obj_file.c
@@ -28,6 +28,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -89,7 +89,7 @@ to be modified before storage in the object file.
GBLREF mident routine_name;
GBLREF spdesc stringpool;
GBLREF int4 linkage_size;
-@@ -381,8 +380,11 @@
+@@ -387,8 +386,11 @@
emit_immed(PADCHARS, padsize);
offset += padsize;
}
@@ -104,7 +104,7 @@ to be modified before storage in the object file.
if (padsize)
{
--- /dev/null
-+++ fis-gtm-V6.0-003/sr_unix/obj_source.c
++++ b/sr_unix/obj_source.c
@@ -0,0 +1,12 @@
+#include "mdef.h"
+
@@ -119,7 +119,7 @@ to be modified before storage in the object file.
+ return sn;
+}
--- /dev/null
-+++ fis-gtm-V6.0-003/sr_unix/obj_source.h
++++ b/sr_unix/obj_source.h
@@ -0,0 +1,12 @@
+#ifndef __OBJ_SOURCE_H__
+#define __OBJ_SOURCE_H__
@@ -133,8 +133,8 @@ to be modified before storage in the object file.
+struct obj_source get_obj_source(void);
+
+#endif
---- fis-gtm-V6.0-003.orig/sr_unix_nsb/comp_lits.c
-+++ fis-gtm-V6.0-003/sr_unix_nsb/comp_lits.c
+--- a/sr_unix_nsb/comp_lits.c
++++ b/sr_unix_nsb/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
diff --git a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR b/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
index 9fc3e43..dfbbf4d 100644
--- a/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
+++ b/debian/patches/up_gtm_destdir_Support-source-to-object-compilation-in-a-DESTDIR
@@ -11,8 +11,8 @@ distribution.
sr_unix/obj_source.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
---- fis-gtm-V6.0-003.orig/sr_unix/obj_source.c
-+++ fis-gtm-V6.0-003/sr_unix/obj_source.c
+--- a/sr_unix/obj_source.c
++++ b/sr_unix/obj_source.c
@@ -1,3 +1,5 @@
+#include "gtm_stdlib.h"
+#include "gtm_string.h"
diff --git a/debian/patches/up_gtm_destdir_substitution b/debian/patches/up_gtm_destdir_substitution
index b69d337..ffe1787 100644
--- a/debian/patches/up_gtm_destdir_substitution
+++ b/debian/patches/up_gtm_destdir_substitution
@@ -7,8 +7,8 @@ Last-Update: 2012-06-19
sr_unix/configure.gtc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- fis-gtm-V6.0-003.orig/sr_unix/configure.gtc
-+++ fis-gtm-V6.0-003/sr_unix/configure.gtc
+--- a/sr_unix/configure.gtc
++++ b/sr_unix/configure.gtc
@@ -376,7 +376,7 @@
cat << SEDSCRIPT > sedin$$
s|ARCH|$arch|g
@@ -18,12 +18,12 @@ Last-Update: 2012-06-19
s|SERVERID|$server_id|g
SEDSCRIPT
for i in $pathmods
-@@ -619,7 +619,7 @@
+@@ -609,7 +609,7 @@
# Install gpgagent.tab
# This is an external call table so the path to the shared library has to be adjusted
-- echo "$gtmdist/plugin/libgtmcrypt.so" > $gtmdist/$plugin/gpgagent.tab
-+ echo "${gtmdist#${gtm_destdir:-}}/plugin/libgtmcrypt.so" > $gtmdist/$plugin/gpgagent.tab
+- echo "$gtmdist/plugin/libgtmcryptutil$ext" > $gtmdist/$plugin/gpgagent.tab
++ echo "${gtmdist#${gtm_destdir:-}}/plugin/libgtmcryptutil$ext" > $gtmdist/$plugin/gpgagent.tab
cat $plugin/gpgagent.tab | sed 1d >> $gtmdist/$plugin/gpgagent.tab
# Tar the source files
diff --git a/debian/patches/upstream_backport_README_change b/debian/patches/upstream_backport_README_change
new file mode 100644
index 0000000..d6c758f
--- /dev/null
+++ b/debian/patches/upstream_backport_README_change
@@ -0,0 +1,24 @@
+--- a/README
++++ b/README
+@@ -31,9 +31,9 @@
+ from http://sourceforge.net/projects/fis-gtm/ Unpack the tar file and run
+ the configure script as root. Note: the tar file unpacks everything into
+ your current working directory, not a new subdirectory. The Linux Standard
+- Base (LSB) install path for GT.M V6.1-000 is /opt/fis-gtm/V6.1-000_i686 or
+- /opt/fis-gtm/V6.1-000_x8664. These instrcutions are written using x8664, please
+- use i686 as necessary.
++ Base (LSB) install path for GT.M V6.1-000 is /opt/fis-gtm/V6.1-000_i586 or
++ /opt/fis-gtm/V6.1-000_x8664. These instructions are written using x8664, please
++ use i586 as necessary.
+
+ $ tar xfz gtm_V61000_linux_x8664_pro.tar.gz
+
+@@ -71,7 +71,7 @@
+ #
+ # -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package
+ #
+- $ cmake <path to>/fis-gtm-V6.1-000 -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package
++ $ cmake -D CMAKE_INSTALL_PREFIX:PATH=${PWD}/package <path to>/fis-gtm-#VER#
+
+ $ make
+
diff --git a/debian/patches/upstream_backport_i586_default_32bit_linux b/debian/patches/upstream_backport_i586_default_32bit_linux
new file mode 100644
index 0000000..c87688f
--- /dev/null
+++ b/debian/patches/upstream_backport_i586_default_32bit_linux
@@ -0,0 +1,21 @@
+--- a/sr_linux/platform.cmake
++++ b/sr_linux/platform.cmake
+@@ -13,6 +13,9 @@
+ set(arch "x86")
+ set(bits 32)
+ set(FIND_LIBRARY_USE_LIB64_PATHS FALSE)
++ # Set arch to i586 in order to compile for Galileo
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=i586")
++ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,-march=i586")
+ else()
+ set(arch "x86_64")
+ set(bits 64)
+@@ -32,7 +35,7 @@
+
+ # Compiler
+ set(CMAKE_C_FLAGS
+- "${CMAKE_C_FLAGS} -ansi -fsigned-char -fPIC -Wmissing-prototypes -fno-omit-frame-pointer")
++ "${CMAKE_C_FLAGS} -ansi -fsigned-char -fPIC -Wmissing-prototypes -Wreturn-type -Wpointer-sign -fno-omit-frame-pointer")
+
+ set(CMAKE_C_FLAGS_RELEASE
+ "${CMAKE_C_FLAGS_RELEASE} -fno-defer-pop -fno-strict-aliasing -ffloat-store")
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list