tags 640559 patch
user ubuntu-de...@lists.ubuntu.com
usertags 640559 ubuntu-patch oneiric
thanks

On Mon, Sep 05, 2011 at 08:47:22PM +0200, Mònica Ramírez Arceda wrote:
> During a rebuild of all packages in sid, your package failed to build on
> amd64.
> 
> Relevant part:
[...]
> > make[2]: *** No rule to make target `/usr/lib/libpcre.a', needed by `ircd'. 
> >  Stop.

This broke because the static library moved with the multiarchification
of libpcre.  Here's a patch.  I didn't see any reason to link libpcre
statically; this seemed to be just a leftover from when the ircd-hybrid
package used to use its embedded copy, and switching to dynamic linking
lets the linker figure out the path for itself.

  * Update 16_use_debian_pcre.dpatch to link dynamically with libpcre rather
    than statically (closes: #640559, LP: #749282).

diff -u ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch 
ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
--- ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
+++ ircd-hybrid-7.2.2.dfsg.2/debian/patches/16_use_debian_pcre.dpatch
@@ -74,14 +74,14 @@
  CORE_SRCS = \
 diff -urNad ircd-hybrid-7.2.2~/src/Makefile.in 
ircd-hybrid-7.2.2/src/Makefile.in
 --- ircd-hybrid-7.2.2~/src/Makefile.in 2006-08-31 18:45:47.034670237 +0000
-+++ ircd-hybrid-7.2.2/src/Makefile.in  2006-08-31 18:45:47.378765476 +0000
++++ ircd-hybrid-7.2.2/src/Makefile.in  2011-09-09 02:23:18.818901800 +0100
 @@ -35,8 +35,8 @@
  
  SSL_LIBS      = @SSL_LIBS@
  SSL_INCLUDES  = @SSL_INCLUDES@
 -IRCDLIBS      = @MODULES_LIBS@ @LIBS@ ../lib/pcre/libpcre.a $(SSL_LIBS)
 -INCLUDES      = -I../include -I../lib/pcre $(SSL_INCLUDES)
-+IRCDLIBS      = @MODULES_LIBS@ @LIBS@ /usr/lib/libpcre.a $(SSL_LIBS)
++IRCDLIBS      = @MODULES_LIBS@ @LIBS@ -lpcre $(SSL_LIBS)
 +INCLUDES      = -I../include -I/usr/include/pcre $(SSL_INCLUDES)
  CPPFLAGS      = ${INCLUDES} @CPPFLAGS@
   
@@ -91,7 +91,7 @@
  build: all
  
 -ircd: @MODULES_LIBS@ ../lib/libpcre.a $(OBJS)
-+ircd: @MODULES_LIBS@ /usr/lib/libpcre.a $(OBJS)
++ircd: @MODULES_LIBS@ $(OBJS)
        ${CC} ${CFLAGS} ${LDFLAGS} -o ircd-hybrid ${OBJS} ${IRCDLIBS}
  
  ../modules/libmodules.a:

Thanks,

-- 
Colin Watson                                       [cjwat...@ubuntu.com]



--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to