[med-svn] [Git][med-team/xmedcon][master] 3 commits: Help to enable cross building

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / xmedcon


Commits:
1636cbd2 by Andreas Tille at 2018-08-07T12:00:07Z
Help to enable cross building

- - - - -
13b1bc96 by Andreas Tille at 2018-08-07T12:01:35Z
Standards-Version: 4.1.5

- - - - -
b74c2d4f by Andreas Tille at 2018-08-07T12:06:46Z
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/cross.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xmedcon (0.15.0+dfsg-3) unstable; urgency=medium
+
+  * Help to enable cross building
+    Closes: #905611
+  * Standards-Version: 4.1.5
+
+ -- Andreas Tille <tille at debian.org>  Tue, 07 Aug 2018 14:01:36 +0200
+
 xmedcon (0.15.0+dfsg-2) unstable; urgency=medium
 
   * Add missing conflicts with old package name


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 11~),
                zlib1g-dev,
                libpng-dev,
                libnifti-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/med-team/xmedcon
 Vcs-Git: https://salsa.debian.org/med-team/xmedcon.git
 Homepage: http://xmedcon.sourceforge.net/
@@ -38,8 +38,8 @@ Section: libdevel
 Depends: libmdc3 (= ${binary:Version}),
          ${misc:Depends}
 Conflicts: libmdc2-dev
-Replaces: libmdc2-dev
 Provides: libmdc2-dev
+Replaces: libmdc2-dev
 Description: Medical Image (DICOM, ECAT, ...) conversion tool (development)
  This project stands for Medical Image Conversion. Released under the
  (L)GPL, it comes with the full C-source code of the library, a


=====================================
debian/patches/cross.patch
=====================================
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,28 @@
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/905611
+Last-Update: Tue, 7 Aug 2018 06:40:45 +0200
+Description: xmedcon fails to cross build from source, because it abuses
+ AC_CHECK_FILE. The macro is meant for checking files on the host system,
+ not for checking files (such as includes) on the build system. For the
+ latter a simple test -f is ok. The attached patch fixes that part, but
+ it doesn't make xmedcon cross buildable: It later fails running
+ libs/dicom/parse, which is built with the host architecture compiler. As
+ a build tool it needs to be built with the build architecture compiler.
+ Fixing that likely involves using AX_CC_FOR_BUILD and possibly rewriting
+ parse.c to avoid relying on dicom.h.
+
+--- xmedcon-0.15.0+dfsg.orig/configure.ac
++++ xmedcon-0.15.0+dfsg/configure.ac
+@@ -505,9 +505,9 @@
+     ZNZ_LDFLAGS="-L$nifti_prefix/lib -lznz"
+     NIFTI_LDFLAGS="-L$nifti_prefix/lib -lniftiio $ZNZ_LDFLAGS"
+     NIFTI_CFLAGS=""
+-    AC_CHECK_FILE([$nifti_prefix/include/nifti/nifti1_io.h],
+-                  [NIFTI_CFLAGS="-I$nifti_prefix/include/nifti"],
+-                  [NIFTI_CFLAGS="-I$nifti_prefix/include"])
++    AS_IF([test -f "$nifti_prefix/include/nifti/nifti1_io.h"],
++          [NIFTI_CFLAGS="-I$nifti_prefix/include/nifti"],
++          [NIFTI_CFLAGS="-I$nifti_prefix/include"])
+     LDFLAGS="$LDFLAGS -lm $NIFTI_LDFLAGS $ZLIB_LDFLAGS"
+     CPPFLAGS="$CPPFLAGS $NIFTI_CFLAGS $ZLIB_LDFLAGS"
+ else


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ code-spelling.patch
 avoid_linking_to_unneeded_libs.patch
 add_gtk_libraries_to_linker.patch
 use_debian_packaged_niftilib.patch
+cross.patch



View it on GitLab: https://salsa.debian.org/med-team/xmedcon/compare/17956d5c5e3939c8b5e46788bbdcd4b2562acea9...b74c2d4faec2c67539af5576a534d6f08b25fc0b

-- 
View it on GitLab: https://salsa.debian.org/med-team/xmedcon/compare/17956d5c5e3939c8b5e46788bbdcd4b2562acea9...b74c2d4faec2c67539af5576a534d6f08b25fc0b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20180807/2bf08701/attachment-0001.html>