From: Jan Rękorajski Date: Thu, 13 Apr 2017 08:25:10 +0000 (+0200) Subject: - fix building on x32 X-Git-Tag: auto/th/povray-3.7.1-0.beta.5.2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpovray.git;a=commitdiff_plain;h=f65cefa - fix building on x32 - rel 2 --- diff --git a/povray.spec b/povray.spec index b7d2b8b..0cddd74 100644 --- a/povray.spec +++ b/povray.spec @@ -4,20 +4,23 @@ %bcond_with pvm # - with PVM support %bcond_with svga # - with svgalib support (doesn't work on many platforms) # +%define rel 2 %define beta beta.5 Summary: Persistence of Vision Ray Tracer Summary(pl.UTF-8): Persistence of Vision Ray Tracer Name: povray Version: 3.7.1 -Release: 0.%{beta}.1 +Release: 0.%{beta}.%{rel} Epoch: 1 License: AGPLv3+ Group: Applications/Graphics Source0: https://github.com/POV-Ray/povray/archive/v%{version}-%{beta}/%{name}-%{version}-%{beta}.tar.gz # Source0-md5: eeff460742acdaa84ebbc7e7e5135981 +Patch0: x32.patch URL: http://www.povray.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: boost-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel >= 1.4.0 BuildRequires: libstdc++-devel @@ -94,6 +97,9 @@ PVM/xwin. %prep %setup -q -n %{name}-%{version}-%{beta} +%ifarch x32 +%patch0 -p1 +%endif %build cd unix diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..7ba4027 --- /dev/null +++ b/x32.patch @@ -0,0 +1,11 @@ +--- povray-3.7.1-beta.5/unix/config/ax_boost_base.m4~ 2017-03-25 14:56:03.000000000 +0100 ++++ povray-3.7.1-beta.5/unix/config/ax_boost_base.m4 2017-04-13 10:17:17.072940712 +0200 +@@ -93,7 +93,7 @@ + ax_arch=`uname -m` + case $ax_arch in + x86_64|ppc64|s390x|sparc64|aarch64) +- libsubdirs="lib64 lib lib64" ++ libsubdirs="libx32 lib64 lib lib64" + ;; + esac +