Attachment 309538 Details for Bug 451668 – Modified specfile

[patch] Modified specfile

mesa.spec.patch (text/plain), 2.17 KB, created by Zoltan Boszormenyi on 2008-06-16 21:06:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zoltan Boszormenyi

Created: 2008-06-16 21:06:28 UTC

Size: 2.17 KB

patch

obsolete

>--- mesa.spec.orig	2008-06-16 20:50:31.000000000 +0200
>+++ mesa.spec	2008-06-16 22:38:21.000000000 +0200
>@@ -1,5 +1,7 @@
> # When bootstrapping an arch, omit the -demos subpackage.
> 
>+%{expand: %%define we_are_really_x86_64 %(uname -a | grep x86_64 | wc -l)}
>+
> # S390 doesn't have video cards, so it's not much use building DRI there.
> %ifarch s390 s390x
> %define with_dri 0
>@@ -37,6 +39,8 @@
> 
> Patch12: mesa-7.1-disable-intel-classic-warn.patch
> 
>+Patch20: mesa-7.1-i386-on-x86_64.patch
>+
> BuildRequires: pkgconfig autoconf automake
> %if %{with_dri}
> BuildRequires: libdrm-devel >= 2.4.0-0.12
>@@ -165,6 +169,12 @@
> %patch7 -p1 -b .dricore
> %patch12 -p1 -b .intel-nowarn
> 
>+%ifarch i386
>+%if %{we_are_really_x86_64}
>+%patch20 -p1 -b .i386-on-x86_64
>+%endif
>+%endif
>+
> # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
> # license and are not open source/free software, so we remove them.
> rm -f include/GL/uglglutshapes.h
>@@ -182,20 +192,29 @@
> export CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
> export CXXFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -Os"
> 
>+# Cheat for building i386 binaries on x86-64 systems
>+%ifarch i386
>+%if %{we_are_really_x86_64}
>+%define bitwidth --enable-32-bit --disable-64-bit
>+export MKLIB_OPTIONS="-ldflags \"-m32\""
>+export LDFLAGS="-m32"
>+%endif
>+%endif
>+
> # first, build the osmesa variants. XXX this is overkill.  osmesa32 is
> # sufficient to render to any of the channel sizes, according to the
> # docs.  should fix this someday.
>-%configure --with-driver=osmesa --with-osmesa-bits=8
>+%configure %{bitwidth} --with-driver=osmesa --with-osmesa-bits=8
> make %{_smp_mflags} SRC_DIRS=mesa
> mv %{_lib} osmesa8
> make clean
> 
>-%configure --with-driver=osmesa --with-osmesa-bits=16
>+%configure %{bitwidth} --with-driver=osmesa --with-osmesa-bits=16
> make %{_smp_mflags} SRC_DIRS=mesa
> mv %{_lib} osmesa16
> make clean
> 
>-%configure --with-driver=osmesa --with-osmesa-bits=32
>+%configure %{bitwidth} --with-driver=osmesa --with-osmesa-bits=32
> make %{_smp_mflags} SRC_DIRS=mesa
> mv %{_lib} osmesa32
> make clean
>@@ -209,6 +228,7 @@
> 
> # now build the rest of mesa
> %configure \
>+    %{bitwidth} \
>     --disable-glw \
>     --disable-glut \
>     --disable-gl-osmesa \

Actions: View | Diff

Attachments on bug 451668: 309537 | 309538 | 311662 | 311663