r46605 - in /packages/inventor/trunk/debian: changelog patches/add-required-libs.patch patches/endianness.patch rules

[smr at users.alioth.debian.org]

Author: smr
Date: Tue Apr  1 01:22:44 2014
New Revision: 46605

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46605
Log:
Apply supplied patches to resolve builds on s390x, aarch64, and to link with --as-needed.

Modified:
    packages/inventor/trunk/debian/changelog
    packages/inventor/trunk/debian/patches/add-required-libs.patch
    packages/inventor/trunk/debian/patches/endianness.patch
    packages/inventor/trunk/debian/rules

Modified: packages/inventor/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/changelog?rev=46605&op=diff
==============================================================================
--- packages/inventor/trunk/debian/changelog	(original)
+++ packages/inventor/trunk/debian/changelog	Tue Apr  1 01:22:44 2014
@@ -1,3 +1,15 @@
+inventor (2.1.5-10-18) unstable; urgency=low
+
+  * patches/endianness.patch: Add s390x and aarch64 to list of 64-bit
+    architectures.  Closes: #739186.
+  
+  * patches/add-required-libs.patch: Link Decal.so explicitly against
+    libc.  Closes: #719485.
+
+  * debian/rules: Link everything with "--as-needed".
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 31 Mar 2014 20:20:06 -0500
+
 inventor (2.1.5-10-17) unstable; urgency=low
 
   * control: Change from lesstif2 to motif.  Closes: #714864.

Modified: packages/inventor/trunk/debian/patches/add-required-libs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/add-required-libs.patch?rev=46605&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/add-required-libs.patch	(original)
+++ packages/inventor/trunk/debian/patches/add-required-libs.patch	Tue Apr  1 01:22:44 2014
@@ -21,7 +21,7 @@
  CXXFILES = Decal.c++
  
 -LLDLIBS = -lInventor -lInventorXt
-+LLDLIBS = -lGL -lInventor -lInventorXt
++LLDLIBS = -lGL -lInventor -lInventorXt -lc
  
  all install: all_ivbin
  

Modified: packages/inventor/trunk/debian/patches/endianness.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/endianness.patch?rev=46605&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/endianness.patch	(original)
+++ packages/inventor/trunk/debian/patches/endianness.patch	Tue Apr  1 01:22:44 2014
@@ -53,7 +53,7 @@
  #endif
  
 +/* Added for Debian by Steve M. Robbins */
-+#if (_MIPS_SZPTR == 64 || __ia64 || __x86_64 || __alpha__ || __powerpc64__)
++#if (_MIPS_SZPTR == 64 || __ia64 || __x86_64 || __alpha__ || __powerpc64__ || __s390x__ || __aarch64__)
 +#  define USE_64BIT_HACKS 1
 +#else
 +#  define USE_64BIT_HACKS 0

Modified: packages/inventor/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/rules?rev=46605&op=diff
==============================================================================
--- packages/inventor/trunk/debian/rules	(original)
+++ packages/inventor/trunk/debian/rules	Tue Apr  1 01:22:44 2014
@@ -29,6 +29,11 @@
 endif
 
 export VCXXOPTS=$(VCOPTS)
+
+# Set linking flags.
+# These options are controlled by the variable VLDOPTS;
+# see setting of "LDFLAGS" in make/commondefs for details. 
+export VLDOPTS=-Wl,--as-needed
 
 # Sadly, the program "ivman" used to generate manual pages
 # is broken on several architectures.  It looks to me like