Package: swish++
Version: 6.1.5-2
Severity: normal

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Please disregard the comments of my previous message; while I had the gold 
linker in my system, the build chroot contained the old ld. Thus, the patch
supplied in bug #629813 does not alone fix this bug.

However, after getting gold inside the build chroot and trying to build the
package, I arrived at a patch that resolves this bug (#556479): supply two
more needed -l switches (-lgcc -lm) to the STDCXXLINK variable inside file
config.mk.

The combined patch that addresses both bugs (#556479, #629813) is attached.
The patch creates two more quilt patches and updates the series file.

I attach also the build log FYI. I will then subsequently merge the two bugs.

regards
George Zarkadas

- -- System Information:
Debian Release: 6.0.2
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 
'stable'), (450, 'testing-proposed-updates'), (450, 'testing'), (400, 
'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=el_GR.utf8, LC_CTYPE=el_GR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages swish++ depends on:
ii  libc6                  2.11.2-10         Embedded GNU C Library: Shared lib
ii  libstdc++6             4.4.5-8           The GNU Standard C++ Library v3
ii  perl [perl5]           5.10.1-17squeeze2 Larry Wall's Practical Extraction 
ii  zlib1g                 1:1.2.3.4.dfsg-3  compression library - runtime

swish++ recommends no packages.

Versions of packages swish++ suggests:
pn  antiword                      <none>     (no description available)
ii  poppler-utils [xpdf-utils]    0.12.4-1.2 PDF utilitites (based on libpopple

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAEBAgAGBQJOZtfwAAoJEJWXIVmJ5BwWmFAH/jV+1qlDEBccwKEaaw6gT5N5
Jp/GjWrR/KMNN868GUZzn2TSDMWafbqNBOxUC9cr699o/VKKG82gDSBXxpZfodRa
td/gpNfaY/B4Ds0Gr/iE2XZ4YKmBzR6Z2X6HUYfDoTN9n+jw/w56KAnWI7WoK0hk
catrS7sDb0gcSBHRthvjipf1Bbdd8dX43jK2SRSJ8JqkG6LD7rhX8ofgofh0eVPs
2PVgL7aM+/xdZX4IPtOWOQnPcRJrloDJ0htRQQ4CRgocnGbnwbJ3XhOzUSILCrzW
cYm0a8OXrcVeMMIr6QGMdpjeY4zkoK7v9XQ3TC4PUmzg5Ttlb9NNtcdyLgBwK9M=
=ilNH
-----END PGP SIGNATURE-----
diff --git a/debian/patches/fix_ftbfs_gold_bug b/debian/patches/fix_ftbfs_gold_bug
new file mode 100644
index 0000000..8aaf3b1
--- /dev/null
+++ b/debian/patches/fix_ftbfs_gold_bug
@@ -0,0 +1,5 @@
+--- swish++-6.1.4.orig/config/config.mk
++++ swish++-6.1.4/config/config.mk
+@@ -186,1 +186,1 @@
+-STDCXXLINK:=	-lstdc++
++STDCXXLINK:=   -lstdc++ -lgcc -lm
diff --git a/debian/patches/include_cstddef_header b/debian/patches/include_cstddef_header
new file mode 100644
index 0000000..a59398b
--- /dev/null
+++ b/debian/patches/include_cstddef_header
@@ -0,0 +1,12 @@
+diff --git a/encoded_char.h b/encoded_char.h
+index 819c993..6b9a371 100644
+--- a/encoded_char.h
++++ b/encoded_char.h
+@@ -25,6 +25,7 @@
+ // standard
+ #include <iterator>
+ #include <set>
++#include <cstddef>
+ 
+ // local
+ #include "iso8859-1.h"
diff --git a/debian/patches/series b/debian/patches/series
index 6a80ecd..84d0831 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,5 @@ fix_man_pages
 use_gcc_for_ld
 splitmail_junk_header
 fixincludes_gcc4.4
+include_cstddef_header
+fix_ftbfs_gold_bug

Attachment: swish++_6.1.5-2_amd64.build.tar.bz2
Description: BZip2 compressed data

Reply via email to