Bug#673165: mapserver: FTBFS with multiarch-ready libgd2

2012-05-21 Thread Cyril Brulebois
tag 673165 patch pending
thanks

Steven Chamberlain ste...@pyro.eu.org (18/05/2012):
 This FTBFS (actually on all arches now?) because libgd2 since
 2.0.36~rc1~dfsg-6.1 uses a multiarch path, where it is not seen by
 these checks in configure.in: […]

That's correct, all archs are affected now.

 The path can't be specified from debian/rules via --with-gd because
 the includes and libraries must all be there.  So the configure.in
 must be modified in some way to look for the static+shared libs in the
 appropriate (multiarch) path...

… or to stop trying to do that entirely.

I've just uploaded a fixed package with the attached source debdiff.
Maintainers, that's a very short notice, but we haven't heard from you
on the bug log, and we badly need fixed packages for gdal. Thanks for
your understanding.

Mraw,
KiBi.
diff -Nru mapserver-6.0.1/debian/changelog mapserver-6.0.1/debian/changelog
--- mapserver-6.0.1/debian/changelog	2012-03-05 16:09:41.0 +0100
+++ mapserver-6.0.1/debian/changelog	2012-05-22 01:31:07.0 +0200
@@ -1,3 +1,12 @@
+mapserver (6.0.1-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix FTBFS with multiarch libgd by just using -lgd instead of trying to
+locate libgd.{a,so}, new patch: multiarch-libgd (Closes: #673165).
+  * Set urgency to “high” for the RC bug fix, needed for the gdal transition.
+
+ -- Cyril Brulebois k...@debian.org  Tue, 22 May 2012 01:28:15 +0200
+
 mapserver (6.0.1-3) unstable; urgency=low
 
   * Let the configure script search in the system directory for jpeg stuff.
diff -Nru mapserver-6.0.1/debian/patches/multiarch-libgd mapserver-6.0.1/debian/patches/multiarch-libgd
--- mapserver-6.0.1/debian/patches/multiarch-libgd	1970-01-01 01:00:00.0 +0100
+++ mapserver-6.0.1/debian/patches/multiarch-libgd	2012-05-22 01:31:07.0 +0200
@@ -0,0 +1,71 @@
+Description: Fix FTBFS with multiarch libgd.
+ The linker knows where to find libgd when one uses -lgd, so stop
+ worrying where libgd.{a,so} are.
+Bug: http://bugs.debian.org/673165
+Author: Cyril Brulebois k...@debian.org
+--- a/configure
 b/configure
+@@ -7649,17 +7649,7 @@ elif test -n $with_gd -a $with_gd !=
+   test -f $GD_DIR/include/gd/gd.h  GD_INCLUDE=$GD_DIR/include/gd
+   test -f $GD_DIR/gd.h  GD_INCLUDE=$GD_DIR
+ 
+-  test -f $GD_DIR/lib/libgd.a  GD_LIBDIR=$GD_DIR/lib
+-  test -f $GD_DIR/lib64/libgd.a  GD_LIBDIR=$GD_DIR/lib64
+-  test -f $GD_DIR/.libs/libgd.a  GD_LIBDIR=$GD_DIR/.libs
+-  test -f $GD_DIR/_libs/libgd.a  GD_LIBDIR=$GD_DIR/_libs
+-  test -f $GD_DIR/libgd.a  GD_LIBDIR=$GD_DIR
+-
+-  test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f $GD_DIR/lib/libgd.dylib  GD_LIBDIR=$GD_DIR/lib
+-  test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl  GD_LIBDIR=$GD_DIR/lib64
+-  test -f $GD_DIR/.libs/libgd.so -o -f $GD_DIR/.libs/libgd.sl -o -f $GD_DIR/.libs/libgd.dylib  GD_LIBDIR=$GD_DIR/.libs
+-  test -f $GD_DIR/_libs/libgd.so -o -f $GD_DIR/_libs/libgd.sl -o -f $GD_DIR/_libs/libgd.dylib  GD_LIBDIR=$GD_DIR/_libs
+-  test -f $GD_DIR/libgd.so -o -f $GD_DIR/libgd.sl -o -f $GD_DIR/libgd.dylib  GD_LIBDIR=$GD_DIR
++  # Let the linker do its job, we really don't need to pass -L$GD_LIBDIR
+ 
+ echo $as_me:$LINENO: checking for gdImageCreatePaletteFromTrueColor in -lgd 5
+ echo $ECHO_N checking for gdImageCreatePaletteFromTrueColor in -lgd... $ECHO_C 6
+@@ -7805,9 +7795,9 @@ fi
+ GD_NEED_ICONV_LIB=$ICONV_LIB
+   fi
+ 
+-  if test -n $GD_INCLUDE -a -n $GD_LIBDIR -a $IS_GD2 = true; then
++  if test -n $GD_INCLUDE -a $IS_GD2 = true; then
+   GD_INC=-I$GD_INCLUDE
+-  GD_LIB=-L$GD_LIBDIR -lgd
++  GD_LIB=-lgd
+   GD_XTRA_LIBS=$GD_XTRA_LIBS $GD_NEED_ICONV_LIB
+   echo $as_me:$LINENO: result: using libgd 2.0.28 (or higher) from $GD_LIB $GD_XTRA_LIBS 5
+ echo ${ECHO_T}using libgd 2.0.28 (or higher) from $GD_LIB $GD_XTRA_LIBS 6
+--- a/configure.in
 b/configure.in
+@@ -636,17 +636,7 @@ elif test -n $with_gd -a $with_gd !=
+   test -f $GD_DIR/include/gd/gd.h  GD_INCLUDE=$GD_DIR/include/gd
+   test -f $GD_DIR/gd.h  GD_INCLUDE=$GD_DIR
+ 
+-  test -f $GD_DIR/lib/libgd.a  GD_LIBDIR=$GD_DIR/lib
+-  test -f $GD_DIR/lib64/libgd.a  GD_LIBDIR=$GD_DIR/lib64
+-  test -f $GD_DIR/.libs/libgd.a  GD_LIBDIR=$GD_DIR/.libs
+-  test -f $GD_DIR/_libs/libgd.a  GD_LIBDIR=$GD_DIR/_libs
+-  test -f $GD_DIR/libgd.a  GD_LIBDIR=$GD_DIR
+-
+-  test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f $GD_DIR/lib/libgd.dylib  GD_LIBDIR=$GD_DIR/lib
+-  test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl  GD_LIBDIR=$GD_DIR/lib64
+-  test -f $GD_DIR/.libs/libgd.so -o -f $GD_DIR/.libs/libgd.sl -o -f $GD_DIR/.libs/libgd.dylib  GD_LIBDIR=$GD_DIR/.libs
+-  test -f $GD_DIR/_libs/libgd.so -o -f $GD_DIR/_libs/libgd.sl -o -f $GD_DIR/_libs/libgd.dylib  GD_LIBDIR=$GD_DIR/_libs
+-  test -f $GD_DIR/libgd.so -o -f $GD_DIR/libgd.sl -o -f $GD_DIR/libgd.dylib  GD_LIBDIR=$GD_DIR
++  # Let the linker do its job, we really don't need to pass -L$GD_LIBDIR
+ 
+   dnl 

Processed: Re: Bug#673165: mapserver: FTBFS with multiarch-ready libgd2

2012-05-21 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 tag 673165 patch pending
Bug #673165 [src:mapserver] mapserver: FTBFS with multiarch-ready libgd2
Added tag(s) pending and patch.
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
673165: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673165
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


Bug#673165: mapserver: FTBFS with multiarch-ready libgd2

2012-05-17 Thread Steven Chamberlain
retitle 673165 mapserver: FTBFS with multiarch-ready libgd2
block 645105 by 673165
thanks

Hi,

This FTBFS (actually on all arches now?) because libgd2 since
2.0.36~rc1~dfsg-6.1 uses a multiarch path, where it is not seen by these
checks in configure.in:

   for GD_DIR in /usr /usr/local
   do
 test -f $GD_DIR/include/gd.h  GD_INCLUDE=$GD_DIR/include
 test -f $GD_DIR/lib/libgd.a  GD_LIBDIR=$GD_DIR/lib
 test -f $GD_DIR/lib64/libgd.a  GD_LIBDIR=$GD_DIR/lib64
 test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f 
 $GD_DIR/lib/libgd.dylib  GD_LIBDIR=$GD_DIR/lib
 test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl  
 GD_LIBDIR=$GD_DIR/lib64

The path can't be specified from debian/rules via --with-gd because the
includes and libraries must all be there.  So the configure.in must be
modified in some way to look for the static+shared libs in the
appropriate (multiarch) path...

Regards,
-- 
Steven Chamberlain
ste...@pyro.eu.org



___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


Processed: Re: Bug#673165: mapserver: FTBFS with multiarch-ready libgd2

2012-05-17 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 retitle 673165 mapserver: FTBFS with multiarch-ready libgd2
Bug #673165 [src:mapserver] mapserver: FTBFS[armel,kfreebsd-i386,mips]: 
configure: error: Could not find gd.h or libgd.a/libgd.so in /usr. 
Changed Bug title to 'mapserver: FTBFS with multiarch-ready libgd2' from 
'mapserver: FTBFS[armel,kfreebsd-i386,mips]: configure: error: Could not find 
gd.h or libgd.a/libgd.so in /usr. '
 block 645105 by 673165
Bug #645105 [release.debian.org] transition: gdal
645105 was blocked by: 648628 631019
645105 was not blocking any bugs.
Added blocking bug(s) of 645105: 673165
 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
645105: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645105
673165: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673165
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel