[Git][debian-gis-team/ogdi-dfsg][master] 2 commits: Add patch by Helmut Grohne to fix FTCBFS. (closes: #902033)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / ogdi-dfsg


Commits:
dd6c8c0a by Bas Couwenberg at 2018-06-21T21:41:33+02:00
Add patch by Helmut Grohne to fix FTCBFS. (closes: #902033)

- - - - -
1bcbedf4 by Bas Couwenberg at 2018-06-21T21:41:33+02:00
Set distribution to unstable.

- - - - -


6 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/hurd
- debian/patches/install-so-link
- debian/patches/makefile
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-ogdi-dfsg (3.2.1+ds-2) UNRELEASED; urgency=medium
+ogdi-dfsg (3.2.1+ds-2) unstable; urgency=medium
 
+  * Team upload.
   * Update Vcs-* URLs for Salsa.
   * Bump Standards-Version to 4.1.4, no changes.
   * Strip trailing whitespace from changelog & rules files.
+  * Add patch by Helmut Grohne to fix FTCBFS.
+    (closes: #902033)
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 31 Mar 2018 12:34:30 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 21 Jun 2018 21:26:54 +0200
 
 ogdi-dfsg (3.2.1+ds-1) unstable; urgency=medium
 


=====================================
debian/patches/cross.patch
=====================================
--- /dev/null
+++ b/debian/patches/cross.patch
@@ -0,0 +1,31 @@
+Description: Don't hardcode compiler to fix cross compilation.
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/902033
+Forwarded: https://github.com/libogdi/ogdi/pull/7
+
+--- a/config/common.mak.in
++++ b/config/common.mak.in
+@@ -46,6 +46,8 @@ OGDI_VERSION      = $(OGDI_MAJOR)$(OGDI_
+ # Default definitions
+ #
+ 
++AUTOCONF_CC = @CC@
++
+ ifndef CFG
+ CFG = release
+ endif
+--- a/config/unix.mak
++++ b/config/unix.mak
+@@ -22,9 +22,9 @@ UNIX_DEFINE	= -Dunix
+ #
+ # Standard tools
+ #
+-CC		= gcc -shared -fPIC
+-LD		= gcc 
+-SHLIB_LD	= gcc -shared -fPIC
++CC		= ${AUTOCONF_CC} -shared -fPIC
++LD		= ${AUTOCONF_CC}
++SHLIB_LD	= ${AUTOCONF_CC} -shared -fPIC
+ AR		= ar cr
+ RM		= rm
+ RMALL		= rm -rf


=====================================
debian/patches/hurd
=====================================
--- a/debian/patches/hurd
+++ b/debian/patches/hurd
@@ -127,7 +127,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
  #
 --- a/configure
 +++ b/configure
-@@ -5879,4 +5879,7 @@ target=`uname`
+@@ -5385,4 +5385,7 @@ target=`uname`
  if test "$target" = "GNU/kFreeBSD" ; then
    target=Linux
  fi
@@ -137,7 +137,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
  mv config/generic.mak config/$target.mak
 --- a/configure.in
 +++ b/configure.in
-@@ -352,4 +352,7 @@ target=`uname`
+@@ -354,4 +354,7 @@ target=`uname`
  if test "$target" = "GNU/kFreeBSD" ; then
    target=Linux
  fi


=====================================
debian/patches/install-so-link
=====================================
--- a/debian/patches/install-so-link
+++ b/debian/patches/install-so-link
@@ -5,7 +5,7 @@ Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/config/common.mak.in
 +++ b/config/common.mak.in
-@@ -257,11 +257,11 @@ default-install:
+@@ -259,11 +259,11 @@ default-install:
  endif
  
  install-so-link:


=====================================
debian/patches/makefile
=====================================
--- a/debian/patches/makefile
+++ b/debian/patches/makefile
@@ -14,7 +14,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
  #
 --- a/makefile
 +++ b/makefile
-@@ -17,7 +17,7 @@ include $(TOPDIR)/config/common.mak
+@@ -22,7 +22,7 @@ include $(TOPDIR)/config/common.mak
  #
  # Sub-directories that need to be built
  #


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ hurd
 hardening
 spelling-errors
 install-so-link
+cross.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/compare/790d03a0ad5a31e1e0ca3b348d3f5a1272898e53...1bcbedf49781b8b00079d675f19cdb6b9a3249d2

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/compare/790d03a0ad5a31e1e0ca3b348d3f5a1272898e53...1bcbedf49781b8b00079d675f19cdb6b9a3249d2
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/pkg-grass-devel/attachments/20180621/a4da8efe/attachment-0001.html>