[Pkg-voip-commits] r4777 - in /opal/trunk/debian: changelog patches/00list.alpha patches/alpha-no-relax.dpatch rules

[kilian at alioth.debian.org]

Author: kilian
Date: Wed Oct 24 10:20:05 2007
New Revision: 4777

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4777
Log:
move patch to 00list.alpha instead of patching LDFLAGS in debian/rules

Added:
    opal/trunk/debian/patches/00list.alpha
    opal/trunk/debian/patches/alpha-no-relax.dpatch
Modified:
    opal/trunk/debian/changelog
    opal/trunk/debian/rules

Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=4777&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Wed Oct 24 10:20:05 2007
@@ -1,7 +1,8 @@
 opal (2.2.11~dfsg1-2) UNRELEASED; urgency=low
 
   * Fix build problem in binutils on alpha by using "LDFLAGS+=-Wl,--no-relax".
-    Thanks goes to Steve Langasek for finding this.
+    Thanks goes to Steve Langasek for finding this and Serge Belyshev for the
+    tested patch.
 
  -- Kilian Krause <kilian at debian.org>  Tue, 23 Oct 2007 12:02:11 +0200
 

Added: opal/trunk/debian/patches/00list.alpha
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/00list.alpha?rev=4777&op=file
==============================================================================
--- opal/trunk/debian/patches/00list.alpha (added)
+++ opal/trunk/debian/patches/00list.alpha Wed Oct 24 10:20:05 2007
@@ -1,0 +1,1 @@
+alpha-no-relax

Added: opal/trunk/debian/patches/alpha-no-relax.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/alpha-no-relax.dpatch?rev=4777&op=file
==============================================================================
--- opal/trunk/debian/patches/alpha-no-relax.dpatch (added)
+++ opal/trunk/debian/patches/alpha-no-relax.dpatch Wed Oct 24 10:20:05 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## alpha-no-relax.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: circumvent binutils bug #440015 on alpha. Thanks goes to Serge Belyshev.
+
+ at DPATCH@
+diff -urNad opal~/opal_inc.mak.in opal/opal_inc.mak.in
+--- opal~/opal_inc.mak.in	2006-01-31 08:10:37.000000000 +0000
++++ opal/opal_inc.mak.in	2007-10-23 20:53:08.000000000 +0000
+@@ -106,7 +106,7 @@
+ OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX)
+ OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
+ 
+-LDFLAGS	    += -L$(OPAL_LIBDIR)
++LDFLAGS	    += -L$(OPAL_LIBDIR) -Wl,--no-relax
+ LDLIBS	    := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS)
+ 
+ STDCCFLAGS  += -I$(OPAL_INCDIR)

Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=4777&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Wed Oct 24 10:20:05 2007
@@ -33,9 +33,6 @@
   confflags += --build $(DEB_HOST_GNU_TYPE)
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-ifeq (,$(findstring alpha-linux-gnu,$(DEB_HOST_GNU_TYPE)))
-  LDFLAGS+=-Wl,--no-relax
 endif
 # Ensure the build aborts when there are still references to undefined
 # symbols.