[med-svn] [fis-gtm] 04/05: Updated quilt patches
Andreas Tille
tille at debian.org
Sun Nov 24 09:01:30 UTC 2013
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository fis-gtm.
commit 0b547bda6b74b3b5cc3239bdc474d91b1f9da165
Author: Andreas Tille <tille at debian.org>
Date: Sun Nov 24 09:30:08 2013 +0100
Updated quilt patches
---
...estdir_Refactor-object-file-source-name-storage | 47 +++++++---------------
...pport-source-to-object-compilation-in-a-DESTDIR | 11 ++---
debian/patches/up_gtm_destdir_substitution | 13 ++----
3 files changed, 22 insertions(+), 49 deletions(-)
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 2bebbe9..35a8263 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,10 +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
-diff --git a/sr_i386/obj_file.c b/sr_i386/obj_file.c
-index 3ff8953..3ae55ca 100644
---- a/sr_i386/obj_file.c
-+++ b/sr_i386/obj_file.c
+--- fis-gtm.orig/sr_i386/obj_file.c
++++ fis-gtm/sr_i386/obj_file.c
@@ -30,6 +30,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -28,7 +26,7 @@ index 3ff8953..3ae55ca 100644
LITREF char gtm_release_name[];
LITREF int4 gtm_release_name_len;
-@@ -444,8 +445,11 @@ void emit_literals(void)
+@@ -444,8 +445,11 @@
emit_immed(PADCHARS, padsize);
offset += padsize;
}
@@ -42,10 +40,8 @@ index 3ff8953..3ae55ca 100644
/* comp_lits aligns the start of routine_name on a NATIVE_WSIZE boundary.*/
padsize = PADLEN(offset, NATIVE_WSIZE);
if (padsize)
-diff --git a/sr_unix/comp_lits.c b/sr_unix/comp_lits.c
-index 3f7b89b..7e8f67f 100644
---- a/sr_unix/comp_lits.c
-+++ b/sr_unix/comp_lits.c
+--- fis-gtm.orig/sr_unix/comp_lits.c
++++ fis-gtm/sr_unix/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
@@ -58,7 +54,7 @@ index 3f7b89b..7e8f67f 100644
GBLREF mident routine_name;
GBLDEF uint4 lits_text_size, lits_mval_size;
-@@ -34,9 +34,12 @@ void comp_lits(rhdtyp *rhead)
+@@ -34,9 +34,12 @@
* following the literal text pool and is considered part of that text pool.*/
offset = (stringpool.free - stringpool.base);
offset += PADLEN(offset, NATIVE_WSIZE);
@@ -74,10 +70,8 @@ index 3f7b89b..7e8f67f 100644
offset += PADLEN(offset, NATIVE_WSIZE);
rhead->routine_name.len = routine_name.len;
rhead->routine_name.addr = (char *)offset;
-diff --git a/sr_unix/obj_file.c b/sr_unix/obj_file.c
-index b8d7709..4b576ba 100644
---- a/sr_unix/obj_file.c
-+++ b/sr_unix/obj_file.c
+--- fis-gtm.orig/sr_unix/obj_file.c
++++ fis-gtm/sr_unix/obj_file.c
@@ -28,6 +28,7 @@
#include "gtmio.h"
#include "mmemory.h"
@@ -86,7 +80,7 @@ index b8d7709..4b576ba 100644
GBLREF char object_file_name[];
GBLREF short object_name_len;
-@@ -38,8 +39,6 @@ GBLREF boolean_t run_time;
+@@ -38,8 +39,6 @@
GBLREF int4 lits_text_size, lits_mval_size;
GBLREF unsigned char *runtime_base;
GBLREF mliteral literal_chain;
@@ -95,7 +89,7 @@ index b8d7709..4b576ba 100644
GBLREF mident routine_name;
GBLREF spdesc stringpool;
GBLREF int4 linkage_size;
-@@ -381,8 +380,11 @@ void emit_literals(void)
+@@ -381,8 +380,11 @@
emit_immed(PADCHARS, padsize);
offset += padsize;
}
@@ -109,11 +103,8 @@ index b8d7709..4b576ba 100644
padsize = (uint4)(PADLEN(offset, NATIVE_WSIZE)); /* comp_lits aligns the start of routine_name on NATIVE_WSIZE boundary.*/
if (padsize)
{
-diff --git a/sr_unix/obj_source.c b/sr_unix/obj_source.c
-new file mode 100644
-index 0000000..55f79b0
--- /dev/null
-+++ b/sr_unix/obj_source.c
++++ fis-gtm/sr_unix/obj_source.c
@@ -0,0 +1,12 @@
+#include "mdef.h"
+
@@ -127,11 +118,8 @@ index 0000000..55f79b0
+ struct obj_source sn = {source_file_name, source_name_len};
+ return sn;
+}
-diff --git a/sr_unix/obj_source.h b/sr_unix/obj_source.h
-new file mode 100644
-index 0000000..138fa5a
--- /dev/null
-+++ b/sr_unix/obj_source.h
++++ fis-gtm/sr_unix/obj_source.h
@@ -0,0 +1,12 @@
+#ifndef __OBJ_SOURCE_H__
+#define __OBJ_SOURCE_H__
@@ -145,10 +133,8 @@ index 0000000..138fa5a
+struct obj_source get_obj_source(void);
+
+#endif
-diff --git a/sr_unix_nsb/comp_lits.c b/sr_unix_nsb/comp_lits.c
-index 5db7087..2c3a7da 100644
---- a/sr_unix_nsb/comp_lits.c
-+++ b/sr_unix_nsb/comp_lits.c
+--- fis-gtm.orig/sr_unix_nsb/comp_lits.c
++++ fis-gtm/sr_unix_nsb/comp_lits.c
@@ -14,10 +14,10 @@
#include <rtnhdr.h>
#include "mdq.h"
@@ -161,7 +147,7 @@ index 5db7087..2c3a7da 100644
GBLREF mident routine_name;
GBLDEF uint4 lits_size, lit_addrs;
-@@ -31,9 +31,12 @@ rhdtyp *rhead;
+@@ -31,9 +31,12 @@
offset = stringpool.free - stringpool.base;
offset += PADLEN(offset, NATIVE_WSIZE);
@@ -177,6 +163,3 @@ index 5db7087..2c3a7da 100644
offset += PADLEN(offset, NATIVE_WSIZE);
rhead->routine_name.len = routine_name.len;
rhead->routine_name.addr = (char *)offset;
---
-1.7.10.4
-
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 32a87e1..df18a65 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,17 +11,15 @@ distribution.
sr_unix/obj_source.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
-diff --git a/sr_unix/obj_source.c b/sr_unix/obj_source.c
-index 55f79b0..8fc4250 100644
---- a/sr_unix/obj_source.c
-+++ b/sr_unix/obj_source.c
+--- fis-gtm.orig/sr_unix/obj_source.c
++++ fis-gtm/sr_unix/obj_source.c
@@ -1,3 +1,5 @@
+#include "gtm_stdlib.h"
+#include "gtm_string.h"
#include "mdef.h"
#include "obj_source.h"
-@@ -8,5 +10,16 @@ GBLREF unsigned short source_name_len;
+@@ -8,5 +10,16 @@
struct obj_source get_obj_source(void)
{
struct obj_source sn = {source_file_name, source_name_len};
@@ -38,6 +36,3 @@ index 55f79b0..8fc4250 100644
+ }
return sn;
}
---
-1.7.10.4
-
diff --git a/debian/patches/up_gtm_destdir_substitution b/debian/patches/up_gtm_destdir_substitution
index 5f8fb41..a14fa89 100644
--- a/debian/patches/up_gtm_destdir_substitution
+++ b/debian/patches/up_gtm_destdir_substitution
@@ -7,11 +7,9 @@ Last-Update: 2012-06-19
sr_unix/configure.gtc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/sr_unix/configure.gtc b/sr_unix/configure.gtc
-index 7db8be7..b9d2ca0 100644
---- a/sr_unix/configure.gtc
-+++ b/sr_unix/configure.gtc
-@@ -372,7 +372,7 @@ fi
+--- fis-gtm.orig/sr_unix/configure.gtc
++++ fis-gtm/sr_unix/configure.gtc
+@@ -376,7 +376,7 @@
cat << SEDSCRIPT > sedin$$
s|ARCH|$arch|g
s|ECHO|"$echo"|g
@@ -20,7 +18,7 @@ index 7db8be7..b9d2ca0 100644
s|SERVERID|$server_id|g
SEDSCRIPT
for i in $pathmods
-@@ -615,7 +615,7 @@ if [ -d "$plugin_gtmcrypt" ]; then
+@@ -619,7 +619,7 @@
# Install gpgagent.tab
# This is an external call table so the path to the shared library has to be adjusted
@@ -29,6 +27,3 @@ index 7db8be7..b9d2ca0 100644
cat $plugin/gpgagent.tab | sed 1d >> $gtmdist/$plugin/gpgagent.tab
# Tar the source files
---
-1.7.10.4
-
--
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git
More information about the debian-med-commit
mailing list