tags 660671 pending
thanks

Hi Mark,

I have uploaded the fixed package to DELAYED/2 with the attached changes.
Both Gregor's and your patch fixed the build, but both were workarounds
for libdispatch-r197_v2.patch not setting extern on some architectures.
I fixed the detection instead of using one of the patches.
forked-daapd now builds fine on my armel Sid system. :-)

Cheers,
Balint

On 11/12/2013 03:14 AM, Mark Heily wrote:
> Hi Balint,
> 
> Thanks for finding a solution to this. Would you mind submitting a NMU
> for this? I am in the process of purchasing a house and preparing to
> move, so my free time is going to be very limited over the next few weeks.
> 
> Regards,
> 
>  - Mark
> 
> 
> On Sat, Nov 9, 2013 at 10:53 AM, Balint Reczey <bal...@balintreczey.hu
> <mailto:bal...@balintreczey.hu>> wrote:
> 
>     tags 660671 affects forked-daapd
>     thanks
> 
>     Hi Mark,
> 
>     Could you please apply the patch(es) to fix building libdispatch on
>     armel?
>     It would also let current forked-daapd build again there.
>     If you don't have time and don't object I can NMU the package too.
> 
>     Cheers,
>     Balint
> 
>     On 07/24/2013 10:30 PM, Peter Denison wrote:
>     > Package: libdispatch-dev
>     > Followup-For: Bug #660671
>     > Control: tag +patch
>     >
>     > Dear Maintainer,
>     >
>     > I can report that this FTBFS is fixed is recent wheezy with ths
>     addition of one patch from the maintainer's web page at
>     http://mark.heily.com/book/export/html/51.
>     >
>     > Adding the "use_gnu_ld" patch
>     (http://mark.heily.com/sites/mark.heily.com/files/use_gnu_ld.patch)
>     allows the build to complete, all tests to pass, and the package is
>     installable.
>     >
>     > -- Build Information:
>     > grep Build libdispatch-0~svn197/debian/control | cut -f 2 -d
>     ':'|awk 'BEGIN { OFS="\n" ; FS="," } {for (i=1; i<NF+1; i++) {print
>     $i}}'|sed 's/\( (.*\)//'| xargs dpkg -l > /tmp/builddeps.log
>     >
>     > /tmp/builddeps.log:
>     > Desired=Unknown/Install/Remove/Purge/Hold
>     > |
>     
> Status=Not/Inst/Conf-files/Unpacked/halF-conf/Half-inst/trig-aWait/Trig-pend
>     > |/ Err?=(none)/Reinst-required (Status,Err: uppercase=bad)
>     > ||/ Name                                  Version                
>       Architecture Description
>     >
>     
> +++-=====================================-=========================-============-==============================================================================
>     > ii  autotools-dev                         20120608.1              
>      all          Update infrastructure for config.{guess,sub} files
>     > ii  clang                                 1:3.0-6.2              
>       armel        Low-Level Virtual Machine (LLVM), C language family
>     frontend
>     > ii  debhelper                             9.20120909              
>      all          helper programs for debian/rules
>     > ii  dh-autoreconf                         7                      
>       all          debhelper add-on to call autoreconf and clean up
>     after the build
>     > ii  libblocksruntime-dev                  0.1-1                  
>       armel        Blocks Runtime (development files)
>     > ii  libblocksruntime0                     0.1-1                  
>       armel        Blocks Runtime library
>     > ii  libkqueue-dev                         1.0.4-2                
>       armel        Development files for libkqueue
>     > ii  libkqueue0                            1.0.4-2                
>       armel        cross-platform library for kernel event notification
>     > ii  libpthread-workqueue-dev              0.8.2-1                
>       armel        thread pool library (development files)
>     > ii  libtool                               2.4.2-1.1              
>       armel        Generic library support script
>     > ii  pkg-config                            0.26-1                  
>      armel        manage compile and link flags for libraries
>     >
>     > dpkg -l | grep llvm
>     > ii  libllvm3.0:armel                      3.0-10                  
>      armel        Low-Level Virtual Machine (LLVM), runtime library
>     > ii  llvm-3.0                              3.0-10                  
>      armel        Low-Level Virtual Machine (LLVM)
>     > ii  llvm-3.0-dev                          3.0-10                  
>      armel        Low-Level Virtual Machine (LLVM), libraries and headers
>     > ii  llvm-3.0-runtime                      3.0-10                  
>      armel        Low-Level Virtual Machine (LLVM), bytecode interpreter
>     >
>     > -- System Information:
>     > Debian Release: 7.1
>     >   APT prefers stable
>     >   APT policy: (500, 'stable')
>     > Architecture: armel (armv5tel)
>     >
>     > Kernel: Linux 3.2.0-4-kirkwood
>     > Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
>     > Shell: /bin/sh linked to /bin/dash
>     >
>     > -- no debconf information
>     >
>     >
>     >
> 
> 
> 

diff -Nru libdispatch-0~svn197/debian/changelog 
libdispatch-0~svn197/debian/changelog
--- libdispatch-0~svn197/debian/changelog       2012-07-09 19:06:11.000000000 
+0200
+++ libdispatch-0~svn197/debian/changelog       2013-11-12 17:52:18.000000000 
+0100
@@ -1,3 +1,10 @@
+libdispatch (0~svn197-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Detect GNU linker on host_os-es other than linux-gnu (Closes: #660671)
+
+ -- Balint Reczey <bal...@balintreczey.hu>  Tue, 12 Nov 2013 17:47:45 +0100
+
 libdispatch (0~svn197-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch 
libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch
--- libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch       
2011-06-29 04:07:22.000000000 +0200
+++ libdispatch-0~svn197/debian/patches/libdispatch-r197_v2.patch       
2013-11-12 17:44:00.000000000 +0100
@@ -22,12 +22,12 @@
 ===================================================================
 --- libdispatch-0~svn197.orig/m4/private-extern.m4     2011-06-28 
22:06:52.000000000 -0400
 +++ libdispatch-0~svn197/m4/private-extern.m4  2011-06-28 22:07:19.000000000 
-0400
-@@ -19,7 +19,15 @@
+@@ -19,6 +19,17 @@
                      [dispatch_cv_private_extern=yes],
                      [dispatch_cv_private_extern=no])])
  
--if test $dispatch_cv_private_extern = yes; then
-+if test $host_os = "linux-gnu" ; then
++case $host_os in
++*gnu*)
 +  #
 +  # WORKAROUND: Building with clang and the GNU linker causes this error:
 +  #
@@ -35,10 +35,19 @@
 +  #
 +  AC_DEFINE([__private_extern__], [extern],
 +          [Define to a replacement for __private_extern])
-+elif test $dispatch_cv_private_extern = yes; then
++  ;;
++*)
+ if test $dispatch_cv_private_extern = yes; then
    AC_DEFINE(HAVE_PRIVATE_EXTERN, 1, Define if __private_extern__ present)
  elif test $dispatch_cv_hidden_visibility_attribute = yes; then
-   AC_DEFINE(HAVE_PRIVATE_EXTERN, 1, Define if __private_extern__ present)
+@@ -29,5 +40,6 @@
+   AC_DEFINE([__private_extern__], [extern],
+           [Define to a replacement for __private_extern])
+ fi
+-
++;;
++esac
+ ])
 Index: libdispatch-0~svn197/src/queue.c
 ===================================================================
 --- libdispatch-0~svn197.orig/src/queue.c      2011-06-28 22:07:04.000000000 
-0400

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to