xutils-dev (1:7.7~2+dyson2) unstable; urgency=low

  * Do not use Sun linker feature (mapfiles, lazyload).
    Issues found when building transfig

2 files changed, 87 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 7e8a9d3..2318eea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.7~2+dyson2) unstable; urgency=low
+
+  * Do not use Sun linker feature (mapfiles, lazyload).
+    Issues found when building transfig
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 06 Apr 2013 16:14:11 +0000
+
 xutils-dev (1:7.7~2+dyson1) unstable; urgency=low
 
   * Built for Dyson
diff --git a/debian/patches/dyson-sun.cf.patch b/debian/patches/dyson-sun.cf.patch
index b79b942..bc8abad 100644
--- a/debian/patches/dyson-sun.cf.patch
+++ b/debian/patches/dyson-sun.cf.patch
@@ -1,8 +1,9 @@
-diff --git a/xorg-cf-files/sun.cf b/xorg-cf-files/sun.cf
-index 516a586..be70138 100644
---- a/xorg-cf-files/sun.cf
-+++ b/xorg-cf-files/sun.cf
-@@ -112,7 +112,7 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
+Description: Dyson is like linux
+Index: xutils-dev/xorg-cf-files/sun.cf
+===================================================================
+--- xutils-dev.orig/xorg-cf-files/sun.cf	2013-04-06 13:20:35.050310488 +0000
++++ xutils-dev/xorg-cf-files/sun.cf	2013-04-06 16:05:18.284319004 +0000
+@@ -112,7 +112,7 @@
   */
  
  #ifndef HasGcc3
@@ -11,7 +12,7 @@ index 516a586..be70138 100644
  #endif
  #ifndef HasGcc2
  #define HasGcc2 HasGcc3
-@@ -430,7 +430,7 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+@@ -430,7 +430,7 @@
  #  endif
  # endif
  # if OSMinorVersion > 3
@@ -20,7 +21,7 @@ index 516a586..be70138 100644
  # endif
  #ifndef LargefileDefines
  # if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6)
-@@ -668,6 +668,9 @@ XCOMM SunPro C++ CplusplusCompilerMajorVersion./**/CplusplusCompilerMinorVersion
+@@ -668,6 +668,9 @@
  #  endif
  # endif
  # if HasGcc2
@@ -30,3 +31,75 @@ index 516a586..be70138 100644
  #  ifndef CcCmd
  #   define CcCmd gcc
  #  endif
+@@ -766,71 +769,6 @@
+ 
+ #endif /* HasGcc (else) */
+ 
+-#if OSMajorVersion < 5
+-# define SharedAllocateLocalDefines -DINCLUDE_ALLOCA_H
+-# define LibraryCCOptions /* don't want special floating point */
+-#else /* OSMajorVersion >= 5, i.e. Solaris 2.0 & later */
+-/* Only load libraries when needed on Solaris 7 & later */
+-# if OSMinorVersion >= 7 
+-#  define LazyLoadFlag -z lazyload -z combreloc
+-# else
+-#  define LazyLoadFlag /* */
+-# endif
+-/* Link with extra mapfiles for some performance & security enhancements */
+-#ifndef MapfileFlag
+-# if HasSunC
+-#  define MapfileFlag -M
+-# else
+-#  define MapfileFlag -Wl,-M,
+-# endif
+-#endif
+-#ifndef Mapfile_BssAlign
+-# if OSMinorVersion >= 9
+-#  define Mapfile_BssAlign $(MAPFILEFLAG)/usr/lib/ld/map.bssalign
+-# else
+-#  define Mapfile_BssAlign /**/
+-# endif
+-#endif
+-#ifndef Mapfile_PageAlign
+-# if OSMinorVersion >= 10
+-#  define Mapfile_PageAlign $(MAPFILEFLAG)/usr/lib/ld/map.pagealign
+-# else
+-#  define Mapfile_PageAlign /**/
+-# endif
+-#endif
+-#ifndef Mapfile_NoExStack
+-# if OSMinorVersion >= 9
+-#  define Mapfile_NoExStack $(MAPFILEFLAG)/usr/lib/ld/map.noexstk
+-# else
+-#  define Mapfile_NoExStack /**/
+-# endif
+-#endif
+-#ifndef Mapfile_NoExData
+-# if defined(SparcArchitecture)
+-/* SPARC archictecture requires PLT section in .data be executable, so
+-   we can only make .bss, not all of .data no-exec on SPARC */
+-#   define Mapfile_NoExData /**/
+-# else
+-#  if OSMinorVersion >= 10
+-#   define Mapfile_NoExData $(MAPFILEFLAG)/usr/lib/ld/map.noexdata
+-#  else
+-#   define Mapfile_NoExData /**/
+-#  endif
+-# endif
+-#endif
+-       MAPFILEFLAG = MapfileFlag
+-  MAPFILES_FOR_ALL = Mapfile_PageAlign Mapfile_NoExData
+-MAPFILES_FOR_PROGS = Mapfile_BssAlign Mapfile_NoExStack
+-/* ExtraLoadFlags apply to all binaries - programs & libraries */
+-# ifndef ExtraLoadFlags
+-#  define ExtraLoadFlags LazyLoadFlag $(MAPFILES_FOR_ALL)
+-# endif
+-/* ExtraLoadOptions only apply to programs */
+-# ifndef ExtraLoadOptions
+-#  define ExtraLoadOptions -B direct $(MAPFILES_FOR_PROGS)
+-# endif
+-#endif /* OSMajorVersion < 5 */
+-
+ /* 64-bit build support */
+ #ifndef Solaris64bitSubdir
+ # ifdef Sparc64Architecture