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

Bug#637903: xutils-dev: install libraries in /usr/lib64 on s390x



Package: xutils-dev
Version: 1:7.6+5
Severity: normal
Tags: patch
User: debian-s390@lists.debian.org
Usertags: s390x

For some obscure reasons, the patch 04_xutils-dev-debian.diff changes
the default installation directory for libraries from /usr/lib64 to
/usr/lib for amd64 and ppc64, but not for s390x. The patch below fixes
that. Would it be possible do include it in the next upload? Thanks in
advance.


diff -Nru xutils-dev-7.6+5/debian/patches/04_xutils-dev-debian.diff xutils-dev-7.6+5+s390x/debian/patches/04_xutils-dev-debian.diff
--- xutils-dev-7.6+5/debian/patches/04_xutils-dev-debian.diff	2011-04-27 16:18:34.000000000 +0000
+++ xutils-dev-7.6+5+s390x/debian/patches/04_xutils-dev-debian.diff	2011-08-15 14:28:14.000000000 +0000
@@ -1521,15 +1521,19 @@
  # endif /* DebianMaintainer */
  #endif /* LinuxDebian */
  
-@@ -591,7 +696,7 @@ InstallNamedTargetNoClobber(install,file
+@@ -591,11 +696,7 @@ InstallNamedTargetNoClobber(install,file
  #define MkdirHierCmd		mkdir -p
  
  #ifndef HaveLib64
 -# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture)
-+# if defined (s390xArchitecture)
- #  define HaveLib64	YES
- # else
- #  define HaveLib64	NO
+-#  define HaveLib64	YES
+-# else
+-#  define HaveLib64	NO
+-# endif
++# define HaveLib64	NO
+ #endif
+ 
+ #if UseElfFormat
 @@ -725,10 +830,10 @@ InstallNamedTargetNoClobber(install,file
  # if UseElfFormat
  #  ifdef AlphaArchitecture

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: s390x

Kernel: 2.6.32-5-s390x (SMP w/3 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash



Reply to: