[med-svn] [fis-gtm] 03/03: V6.2-002 update, patch refresh, minor build fixes
Amul Shah
tuskentower-guest at moszumanska.debian.org
Tue Jun 9 04:29:54 UTC 2015
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 1b4d00e1780aaa4633518f1aa0c9bccbf12739b2
Author: Amul Shah <Amul.Shah at fisglobal.com>
Date: Tue Jun 9 00:25:54 2015 -0400
V6.2-002 update, patch refresh, minor build fixes
debian/changelog, debian/control - version update
debian/rules - CMake configuration command must specify the build type, Release
or Debug to pick the correct copy of gtm_threadgbl_deftypes_asm_{pro,dbg}.si
debian/patches/upstream_fix_depency_order libmumps.a depends on xfer_desc.i. In
regular builds, the existing CMakeLists.txt works. Under debuild, libmumps.a
was built before xfer_desc.i resulting in a build failure.
debian/patches/fix_utf8 upstream applied this patch
debian/patches/* - patch refresh
---
debian/changelog | 6 +++
debian/control | 4 +-
debian/patches/fix_utf8 | 46 ----------------------
debian/patches/series | 2 +-
debian/patches/upstream_disable_autorelink | 2 +-
.../upstream_donot_deploy_all_encryption_libs | 12 +++---
debian/patches/upstream_fix_depency_order | 20 ++++++++++
debian/patches/upstream_fix_speeling_errors | 2 +-
debian/rules | 2 +-
9 files changed, 38 insertions(+), 58 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e56fa6..02190d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+fis-gtm (6.2-002-1) unstable; urgency=low
+
+ * Import latest sources and update package version
+
+ -- Amul Shah <Amul.Shah at fisglobal.com> Mon, 08 Jun 2015 20:37:55 -0400
+
fis-gtm (6.2-001-1) unstable; urgency=low
* Import latest sources and update package version
diff --git a/debian/control b/debian/control
index d60470b..1c5d6a3 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Homepage: http://sourceforge.net/projects/fis-gtm
Package: fis-gtm
Architecture: all
Depends: ${misc:Depends},
- fis-gtm-6.2-001
+ fis-gtm-6.2-002
Provides: mumps
Description: metapackage for the latest version of FIS-GT.M database
GT.M is a database engine with scalability proven in large real-time
@@ -61,7 +61,7 @@ Description: metapackage for the latest version of FIS-GT.M database
.
This metapackage always depends from the default fis-gtm version.
-Package: fis-gtm-6.2-001
+Package: fis-gtm-6.2-002
Architecture: amd64 i386
Multi-Arch: same
Depends: ${shlibs:Depends},
diff --git a/debian/patches/fix_utf8 b/debian/patches/fix_utf8
deleted file mode 100644
index 58cc5a6..0000000
--- a/debian/patches/fix_utf8
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Amul Shah <Amul.Shah at fisglobal.com>
-Forwarded: not-needed
-Summary: Fix for #775302
-Description: GTM-8041 Fix the bug that caused compilations of UTF-8 mode object
- files to fail because 'locale -a' output in pbuilder did not include
- en_US.UTF-8.
- Additionally trap errors in gtminstall from the configure script. Had this
- error trapping existed previously, the first build logs would have shown this
- bug.
-Applied-Upstream: V6.2-002
-Last-Update: 2015-04-22
-
---- a/sr_unix/configure.gtc
-+++ b/sr_unix/configure.gtc
-@@ -699,12 +699,13 @@
- # Enclose UTF-8 operations inside a subshell. This avoids changing the current M mode execution
- (
- # Ensure we ARE in UTF-8 mode
-- utflocale=`locale -a | grep -i en_us | grep -i utf | grep '8$' | head -n 1`
-+ utflocale=`locale -a | grep -iE '\.utf.?8$' | head -n1`
- if [ $arch = "zos" ]; then
-- utflocale=`locale -a | grep -i en_us | grep -i utf | sed 's/.lp64$//' | grep '8$' | head -n 1`
-+ utflocale=`locale -a | grep -i utf | sed 's/.lp64$//' | grep '8$' | head -n 1`
- fi
-
-- if [ $utflocale = "" ]; then
-+ # If no locale is found use C
-+ if [ "$utflocale" = "" ]; then
- utflocale="C"
- fi
- if [ $arch != "zos" ]; then
-@@ -927,3 +928,4 @@
- \rm -rf utf8
- fi
- fi
-+exit 0
---- a/sr_unix/gtminstall.sh
-+++ b/sr_unix/gtminstall.sh
-@@ -458,6 +458,7 @@
- if [ "Y" = "$gtm_dryrun" ] ; then echo Installation prepared in $gtm_tmp ; exit ; fi
-
- ./configure.sh <$gtm_configure_in 1> $gtm_tmp/configure_${timestamp}.out 2>$gtm_tmp/configure_${timestamp}.err
-+if [ $? -gt 0 ] ; then cat $gtm_tmp/configure_${timestamp}.out $gtm_tmp/configure_${timestamp}.err ; fi
- if [ "Y" = "$gtm_verbose" ] ; then echo Installation complete ; ls -l $gtm_installdir ; fi
-
- # Create copies of environment scripts and gtm executable
diff --git a/debian/patches/series b/debian/patches/series
index 2782653..6e9a338 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@
upstream_disable_autorelink
upstream_fix_speeling_errors
upstream_donot_deploy_all_encryption_libs
-fix_utf8
+upstream_fix_depency_order
diff --git a/debian/patches/upstream_disable_autorelink b/debian/patches/upstream_disable_autorelink
index a32d6d0..0726e55 100644
--- a/debian/patches/upstream_disable_autorelink
+++ b/debian/patches/upstream_disable_autorelink
@@ -10,7 +10,7 @@ Last-Update: 2015-01-14
--- a/sr_unix/gtmprofile.gtc
+++ b/sr_unix/gtmprofile.gtc
-@@ -169,7 +169,7 @@
+@@ -147,7 +147,7 @@
if [ -d $gtm_dist/plugin/o ] ; then
gtmroutines=`$gtm_dist/mumps -run %XCMD 'set x=$ztrnlnm("gtm_dist")_"/plugin/o/*."_$ztrnlnm("tmp_gtm_shlib") for set y=$zsearch(x) quit:""=y write y," "'`"$gtm_dist/plugin/o($gtm_dist/plugin/r) $gtmroutines"
fi
diff --git a/debian/patches/upstream_donot_deploy_all_encryption_libs b/debian/patches/upstream_donot_deploy_all_encryption_libs
index 1ea92aa..0822bda 100644
--- a/debian/patches/upstream_donot_deploy_all_encryption_libs
+++ b/debian/patches/upstream_donot_deploy_all_encryption_libs
@@ -11,28 +11,28 @@ Last-Update: 2015-01-11
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -491,7 +491,7 @@
- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+@@ -544,7 +544,7 @@
)
target_link_libraries(libgtmcrypt_openssl_AES256CFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
+ add_dependencies(libgtmcrypt_openssl_AES256CFB gen_gtm_threadgbl_deftypes)
-install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
+#install(TARGETS libgtmcrypt_openssl_AES256CFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
# Library=OPENSSL Algorithm=BLOWFISHCFB
add_library(libgtmcrypt_openssl_BLOWFISHCFB MODULE ${libgtmcrypt_SOURCES})
-@@ -501,7 +501,7 @@
- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+@@ -555,7 +555,7 @@
)
target_link_libraries(libgtmcrypt_openssl_BLOWFISHCFB ${GPG_LIBRARIES} ${TLS_LIBRARIES})
+ add_dependencies(libgtmcrypt_openssl_BLOWFISHCFB gen_gtm_threadgbl_deftypes)
-install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
+#install(TARGETS libgtmcrypt_openssl_BLOWFISHCFB DESTINATION ${GTM_INSTALL_DIR}/plugin)
add_library(libgtmtls MODULE ${libgtmtls_SOURCES})
set_target_properties(libgtmtls PROPERTIES
-@@ -510,7 +510,7 @@
- LIBRARY_OUTPUT_DIRECTORY ${GTM_BINARY_DIR}/plugin
+@@ -565,7 +565,7 @@
)
target_link_libraries(libgtmtls ${TLS_LIBRARIES})
+ add_dependencies(libgtmtls gen_gtm_threadgbl_deftypes)
-install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin)
+#install(TARGETS libgtmtls DESTINATION ${GTM_INSTALL_DIR}/plugin)
diff --git a/debian/patches/upstream_fix_depency_order b/debian/patches/upstream_fix_depency_order
new file mode 100644
index 0000000..cee2c1a
--- /dev/null
+++ b/debian/patches/upstream_fix_depency_order
@@ -0,0 +1,20 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Forwarded: not-needed
+Summary: xfer_desc is being built out of order
+Description: Due to a change in build order, xfer_desc.i is not generated prior
+ to building libmumps.a. libmumps.a depends on xfer_desc.i, so make that
+ dependency explicit.
+Last-Update: 2015-06-08
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -418,6 +418,9 @@
+ set_property(TARGET lib${lib} PROPERTY OUTPUT_NAME ${lib})
+ add_dependencies(lib${lib} gen_gtm_threadgbl_deftypes)
+ endforeach()
++if(gen_xfer_desc)
++ add_dependencies(libmumps gen_xfer_desc)
++endif()
+
+ # TODO: find_package or find_library for system libs?
+ include_directories (/usr/local/include)
diff --git a/debian/patches/upstream_fix_speeling_errors b/debian/patches/upstream_fix_speeling_errors
index 984196c..5eaf037 100644
--- a/debian/patches/upstream_fix_speeling_errors
+++ b/debian/patches/upstream_fix_speeling_errors
@@ -23,7 +23,7 @@ Last-Update: 2014-10-04
free(lbp);
--- a/sr_port/rsel.mpt
+++ b/sr_port/rsel.mpt
-@@ -121,11 +121,11 @@
+@@ -122,11 +122,11 @@
s end=$p(r,":",2),beg=$p(r,":"),rdf=0
i end=beg!'$l(end) q:'$l(beg) s stop=last ; if all stripped out, done
s:'$l(beg) beg="*" s pct=$e(beg) ; CAUTION: ELSE on next line
diff --git a/debian/rules b/debian/rules
index 182b74c..4f6c871 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_auto_build:
dh_auto_build
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_INSTALL_PREFIX:PATH=/usr -DGTM_INSTALL_DIR=$(GTM_INSTALL_DIR)
+ dh_auto_configure -- -DCMAKE_INSTALL_PREFIX:PATH=/usr -DGTM_INSTALL_DIR=$(GTM_INSTALL_DIR) -DCMAKE_BUILD_TYPE=Release
override_dh_auto_install:
#echo "umask is: "
--
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