[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: SVN texlive (2009) commit: r4342 - texlive2009/trunk/texlive-bin/debian



Hello,

On Thu, Nov 12, 2009 at 07:43:59AM +0000, Ahmed El-Mahmoudy wrote:
> Modified:
>    texlive2009/trunk/texlive-bin/debian/control
>    texlive2009/trunk/texlive-bin/debian/rules
> Log:
> >From TL2007 package: build using g++4.4 on armel instead of g++4.2 (Closes: #533796)
---end quoted text---

  Btw, I notice that Ubuntu fixes the armel issue using a different 
  method, they pass -fno-tree-ter option to g++ instead on using this 
  versioned g++ dependancy. I am attaching the Ubuntu diff with this 
  email.

  Is it possible that it would be done in the same way in Debian ? 
  Please note that this is the only remaining difference between Debian 
  & Ubuntu regarding this package.

-- 
 ‎أحمد المحمودي (Ahmed El-Mahmoudy)
  Digital design engineer
 GPG KeyID: 0xEDDDA1B7 (@ subkeys.pgp.net)
 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8  B176 BC19 6A94 EDDD A1B7
Index: debian/control
===================================================================
--- debian/control	(revision 4342)
+++ debian/control	(working copy)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer:  Debian TeX Maintainers <debian-tex-maint@lists.debian.org>
 Uploaders: Norbert Preining <preining@debian.org>, Frank Küster <frank@kuesterei.ch>
-Build-Depends: debhelper (>= 7), quilt, sharutils, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-dev (>= 0.6), chrpath, g++-4.4 [armel], time
+Build-Depends: debhelper (>= 7), quilt, sharutils, ed, libncurses5-dev | libncurses-dev, libxaw7-dev, libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, libgd2-xpm-dev | libgd2-noxpm-dev, flex, bison, libpoppler-dev (>= 0.6), chrpath, time
 Standards-Version: 3.8.3
 Homepage: http://www.tug.org/texlive
 
Index: debian/rules
===================================================================
--- debian/rules	(revision 4342)
+++ debian/rules	(working copy)
@@ -18,13 +18,13 @@
 # if we are compiling on armel we have to use gcc/g++ 4.4 to fix the 
 # build error due to upstream bug, see #483939
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-GCC_44_ARCHES := armel
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),$(GCC_42_ARCHES)))
-    export CC=gcc-4.4
-    export CXX=g++-4.4
+ifneq (,$(filter $(DEB_BUILD_ARCH),armel))
+    CXXFLAGS += -fno-tree-ter
 endif
 
+export CXXFLAGS
+
 #
 # upstream stuff
 upstream_pre_release=true

Reply to: