[packages/kde4-kde3support] - more x32 fixes

[baggins]

commit 3b16b91c80bbe3e8181fc2877c01c022fe6ac35a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 25 18:05:34 2018 +0100

    - more x32 fixes

 kde4-kde3support.spec |  2 ++
 x32.patch             | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
---
diff --git a/kde4-kde3support.spec b/kde4-kde3support.spec
index 7a2e0e0..19c138b 100644
--- a/kde4-kde3support.spec
+++ b/kde4-kde3support.spec
@@ -43,6 +43,7 @@ Patch13:	kdelibs-cups22.patch
 Patch14:	gcc6.patch
 Patch15:	gcc7.patch
 Patch16:	openssl-1.1.patch
+Patch17:	x32.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.4.0.a
 BuildRequires:	acl-devel
@@ -260,6 +261,7 @@ KDE.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 mv -f configure{,.dist}
 :>admin/test-driver
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..7045ef3
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,46 @@
+--- kdelibs-3.5.10/admin/libtool.m4.in~	2018-11-25 17:12:01.000000000 +0100
++++ kdelibs-3.5.10/admin/libtool.m4.in	2018-11-25 17:53:09.819409957 +0100
+@@ -498,6 +498,10 @@
+     *32-bit*)
+       LINUX_64_MODE="32"
+       case $host in
++        x86_64-*linux*gnux32)
++          LINUX_64_MODE="x32"
++	  LD="${LD-ld} -m elf32_x86_64"
++	  ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -1428,6 +1432,9 @@
+       libsuff=64
+     fi
+   fi
++  if test "x$LINUX_64_MODE" = x32; then
++    libsuff=x32
++  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+--- kdelibs-3.5.10/acinclude.m4~	2018-11-25 17:12:05.000000000 +0100
++++ kdelibs-3.5.10/acinclude.m4	2018-11-25 18:03:46.954375525 +0100
+@@ -6436,6 +6436,10 @@
+     *32-bit*)
+       LINUX_64_MODE="32"
+       case $host in
++        x86_64-*linux*gnux32)
++          LINUX_64_MODE="x32"
++	  LD="${LD-ld} -m elf32_x86_64"
++	  ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_i386"
+           ;;
+@@ -7366,6 +7370,9 @@
+       libsuff=64
+     fi
+   fi
++  if test "x$LINUX_64_MODE" = x32; then
++    libsuff=x32
++  fi
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kde3support.git/commitdiff/3b16b91c80bbe3e8181fc2877c01c022fe6ac35a