[packages/xorg-cf-files] - replaced lib64/libx32 patches with universal libdir patch; cover also UsrLibDir for x32 - release
qboosh
qboosh at pld-linux.org
Wed Apr 13 21:48:47 CEST 2016
commit 92aae75421f26cda64c3e40455f0c1500f661b08
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Apr 13 21:48:55 2016 +0200
- replaced lib64/libx32 patches with universal libdir patch; cover also UsrLibDir for x32
- release 2
xorg-cf-files-lib64.patch | 14 -------
xorg-cf-files-libdir.patch | 95 ++++++++++++++++++++++++++++++++++++++++++++++
xorg-cf-files-libx32.patch | 14 -------
xorg-cf-files.spec | 10 +----
4 files changed, 97 insertions(+), 36 deletions(-)
---
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 9667033..b0304e7 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -2,14 +2,13 @@ Summary: X.org cf files
Summary(pl.UTF-8): Pliki cf z X.org
Name: xorg-cf-files
Version: 1.0.6
-Release: 1
+Release: 2
License: MIT
Group: X11/Development/Tools
Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
# Source0-md5: 28649f34fa23143f1945aa2750e1472a
Patch0: %{name}-mandir.patch
-Patch1: %{name}-lib64.patch
-Patch2: %{name}-libx32.patch
+Patch1: %{name}-libdir.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -33,12 +32,7 @@ bibliotek kiedyś dostarczanych w monolitycznych wydaniach X.Org.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
-%if "%{_lib}" == "lib64"
%patch1 -p1
-%endif
-%if "%{_lib}" == "libx32"
-%patch2 -p1
-%endif
%build
%{__aclocal}
diff --git a/xorg-cf-files-lib64.patch b/xorg-cf-files-lib64.patch
deleted file mode 100644
index 13da4e3..0000000
--- a/xorg-cf-files-lib64.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xorg-cf-files-X11R7.0-1.0.1/X11.tmpl.orig 2006-04-17 13:03:34.000000000 +0200
-+++ xorg-cf-files-X11R7.0-1.0.1/X11.tmpl 2006-04-17 13:05:22.000000000 +0200
-@@ -1461,9 +1461,9 @@
- #endif
- #ifndef LibDir
- # ifdef ProjectRoot
--# define LibDir Concat(ProjectRoot,/lib/X11)
-+# define LibDir Concat(ProjectRoot,/lib64/X11)
- # else
--# define LibDir /usr/lib/X11
-+# define LibDir /usr/lib64/X11
- # endif
- #endif
- #ifndef ModuleDir
diff --git a/xorg-cf-files-libdir.patch b/xorg-cf-files-libdir.patch
new file mode 100644
index 0000000..982539c
--- /dev/null
+++ b/xorg-cf-files-libdir.patch
@@ -0,0 +1,95 @@
+--- xorg-cf-files-1.0.6/Imake.cf.orig 2015-12-22 02:28:02.000000000 +0100
++++ xorg-cf-files-1.0.6/Imake.cf 2016-04-13 18:09:27.418272365 +0200
+@@ -1025,6 +1025,9 @@ XCOMM Keep cpp from replacing path eleme
+ # undef __amd64__
+ # undef __x86_64__
+ # define AMD64Architecture
++# if defined(_ILP32) | defined(__ILP32__)
++# define AMD64ArchX32ABI
++# endif
+ # endif
+ # if defined(amd64__) || defined (x86_64__)
+ # undef amd64__
+--- xorg-cf-files-1.0.6/linux.cf.orig 2016-04-13 18:03:18.456082965 +0200
++++ xorg-cf-files-1.0.6/linux.cf 2016-04-13 18:13:41.561260974 +0200
+@@ -579,13 +579,21 @@ InstallNamedTargetNoClobber(install,file
+ #define MkdirHierCmd mkdir -p
+
+ #ifndef HaveLib64
+-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
++# if (defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)) && !defined (AMD64ArchX32ABI)
+ # define HaveLib64 YES
+ # else
+ # define HaveLib64 NO
+ # endif
+ #endif
+
++#ifndef HaveLibX32
++# if defined (AMD64ArchX32ABI)
++# define HaveLibX32 YES
++# else
++# define HaveLibX32 NO
++# endif
++#endif
++
+ #if UseElfFormat
+ # ifndef DoLoadableServer
+ # if defined(MipsArchitecture) || defined(SuperHArchitecture)
+@@ -645,16 +653,20 @@ InstallNamedTargetNoClobber(install,file
+ # ifndef TermcapLibrary
+ # if UseStaticTermcapLib
+ # if LinuxUsesNcurses
+-# if !HaveLib64
+-# define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
+-# else
++# if HaveLib64
+ # define TermcapLibrary StaticLibrary(/usr/lib64,ncurses)
++# elif HaveLibX32
++# define TermcapLibrary StaticLibrary(/usr/libx32,ncurses)
++# else
++# define TermcapLibrary StaticLibrary(/usr/lib,ncurses)
+ # endif
+ # else
+-# if !HaveLib64
+-# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap)
+-# else
++# if HaveLib64
+ # define TermcapLibrary StaticLibrary(/usr/lib64/termcap,termcap)
++# elif HaveLibX32
++# define TermcapLibrary StaticLibrary(/usr/libx32/termcap,termcap)
++# else
++# define TermcapLibrary StaticLibrary(/usr/lib/termcap,termcap)
+ # endif
+ # endif
+ # else
+@@ -1081,6 +1093,16 @@ InstallNamedTargetNoClobber(install,file
+ # ifndef TkLibDir
+ # define TkLibDir /usr/lib64
+ # endif
++#elif HaveLibX32
++# ifndef LibDirName
++# define LibDirName libx32
++# endif
++# ifndef SystemUsrLibDir
++# define SystemUsrLibDir /usr/libx32
++# endif
++# ifndef TkLibDir
++# define TkLibDir /usr/libx32
++# endif
+ #endif
+
+ #ifndef BuildDmx
+--- xorg-cf-files-1.0.6/X11.tmpl.orig 2015-12-22 02:28:02.000000000 +0100
++++ xorg-cf-files-1.0.6/X11.tmpl 2016-04-13 18:06:00.297687169 +0200
+@@ -1461,9 +1461,9 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
+ #endif
+ #ifndef LibDir
+ # ifdef ProjectRoot
+-# define LibDir Concat(ProjectRoot,/lib/X11)
++# define LibDir Concat(ProjectRoot,/LibDirName/X11)
+ # else
+-# define LibDir /usr/lib/X11
++# define LibDir /usr/LibDirName/X11
+ # endif
+ #endif
+ #ifndef ModuleDir
diff --git a/xorg-cf-files-libx32.patch b/xorg-cf-files-libx32.patch
deleted file mode 100644
index 624f97d..0000000
--- a/xorg-cf-files-libx32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xorg-cf-files-X11R7.0-1.0.1/X11.tmpl.orig 2006-04-17 13:03:34.000000000 +0200
-+++ xorg-cf-files-X11R7.0-1.0.1/X11.tmpl 2006-04-17 13:05:22.000000000 +0200
-@@ -1461,9 +1461,9 @@
- #endif
- #ifndef LibDir
- # ifdef ProjectRoot
--# define LibDir Concat(ProjectRoot,/lib/X11)
-+# define LibDir Concat(ProjectRoot,/libx32/X11)
- # else
--# define LibDir /usr/lib/X11
-+# define LibDir /usr/libx32/X11
- # endif
- #endif
- #ifndef ModuleDir
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-cf-files.git/commitdiff/92aae75421f26cda64c3e40455f0c1500f661b08
More information about the pld-cvs-commit
mailing list