Attachment 575878 Details for Bug 810059 – Patch from release 3 using the new Makefile, fixes most rpmlint warnings

[patch] Patch from release 3 using the new Makefile, fixes most rpmlint warnings

01-use-new-makefile.patch (text/plain), 3.18 KB, created by Alec Leamas on 2012-04-07 07:41:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alec Leamas

Created: 2012-04-07 07:41:00 UTC

Size: 3.18 KB

patch

obsolete

>Use new Makefile
>
>From: Alec Leamas <leamas.alec@gmail.com>
>
>Respects CFLAGS, and thus provides a hook to handle %optflags. Always
>rebuilds the generated C files (not done in original). The whitespace
>patch gives runtime errors when genereting those files, and is thus
>removed. Does not trim. Fixes -Wl typo in soname argument
>
>Removing the trim-whitespace patch
>
>This patch gives runtime errors.
>---
>
> Makefile.linux    |   15 +++++++++++++++
> opencl-utils.spec |   21 ++++++++++-----------
> 2 files changed, 25 insertions(+), 11 deletions(-)
> create mode 100644 Makefile.linux
>
>
>diff --git a/Makefile.linux b/Makefile.linux
>new file mode 100644
>index 0000000..9d22a5f
>--- /dev/null
>+++ b/Makefile.linux
>@@ -0,0 +1,15 @@
>+all: libclrun.so
>+
>+CFLAGS   +=   -I../include -Wall 
>+
>+libclrun.so : gencl.o genclgl.o clrun.o dynamiclib.o
>+	gcc $(CFLAGS) --shared -ldl $? -o $@
>+
>+gencl.c: ../include/CL/cl.h 
>+	./generateClRun.pl $? > $@
>+
>+genclgl.c: ../include/CL/cl_gl.h
>+	./generateClRun.pl $? > $@
>+
>+clean:
>+	rm -rf *~ *.o gencl.c genclgl.c
>diff --git a/opencl-utils.spec b/opencl-utils.spec
>index 78188bc..5f80113 100644
>--- a/opencl-utils.spec
>+++ b/opencl-utils.spec
>@@ -1,4 +1,6 @@
> %global svnversion 16
>+%global soname     libclrun.so.%{version}.%{svnversion}
>+
> Name:           opencl-utils
> Version:        0
> Release:        3.svn%{svnversion}%{?dist}
>@@ -12,12 +14,10 @@ Url:            http://code.google.com/p/%{name}
> #tar -Jcv --exclude-vcs -f opencl-utils.tar.xz opencl-utils
> #rm -f -r opencl-utils
> Source:         %{name}.tar.xz
>+Source1:        Makefile.linux
> #Adapted from Dolphin-Emu:
> #http://code.google.com/p/dolphin-emu/issues/detail?id=2927
> Patch0:         %{name}-correctOpenCLpointers.patch
>-#Adds whitespace triming in generateClRun.pl (also from Dolphin-Emu):
>-#http://code.google.com/p/dolphin-emu/source/browse/Externals/CLRun/clrun/generateClRun.pl
>-Patch1:         %{name}-trimwhitespace.patch
> 
> BuildRequires:  mesa-libGL-devel
> 
>@@ -60,16 +60,14 @@ optimization hints and common kernel templates.
> %prep
> %setup -q -n %{name}
> %patch0 -p0
>-%patch1 -p0
>-sed -i 's/Wall/Wall -fPIC/g' src/clrun/Makefile
>-sed -i '/strip libclrun.so/d' src/clrun/Makefile
>-sed -i 's/ldl/ldl -Wl,-soname,libclrun.so.%{version}.%{svnversion}/g' src/clrun/Makefile
>+cp %SOURCE1 src/clrun/Makefile
> #unneed windows build file
> rm -f examples/OCLUtilsExamples.vcproj
> 
> %build
> cd src/clrun/
>-make
>+make clean
>+env CFLAGS="%{optflags} -fPIC -Wl,-soname=%{soname}" make 
> 
> %install
> mkdir -p %{buildroot}%{_libdir} %{buildroot}%{_datadir}/%{name}
>@@ -80,10 +78,11 @@ install -p -D -m 0755 src/clrun/*.pl %{buildroot}%{_includedir}/%{name}/clrun
> cp -r src/include %{buildroot}%{_includedir}/%{name}/
> cp -r examples %{buildroot}%{_datadir}/%{name}/examples
> #install the library and the links
>-install -p -D -m 0755 src/clrun/libclrun.so %{buildroot}%{_libdir}/libclrun.so.%{version}.%{svnversion}
>+install -p -D -m 0755 src/clrun/libclrun.so %{buildroot}%{_libdir}/%{soname}
> cd %{buildroot}%{_libdir}
>-ln -sf libclrun.so.%{version}.%{svnversion} libclrun.so.%{version}
>-ln -sf libclrun.so.%{version}.%{svnversion} libclrun.so
>+soname=%{soname}
>+ln -sf  $soname ${soname%%.*}
>+ln -sf  $soname ${soname%%.*.*}
> 
> %files CLRun
> %{_libdir}/*.so.*

Actions: View | Diff

Attachments on bug 810059: 575645 | 575878 | 575879 | 575880