[packages/clthreads] fix passing compiler and flags to make

jajcus jajcus at pld-linux.org
Sat Oct 15 12:40:14 CEST 2016


commit 9a79afbd7639b17679714a28e8807a8db1237f1e
Author: Jacek Konieczny <jajcus at jajcus.net>
Date:   Sat Oct 15 12:40:00 2016 +0200

    fix passing compiler and flags to make

 clthreads.spec |  9 ++++++---
 makefile.patch | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/clthreads.spec b/clthreads.spec
index a70e37d..6043eeb 100644
--- a/clthreads.spec
+++ b/clthreads.spec
@@ -6,6 +6,7 @@ License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5:	90b650f1f5c9f39f4d77f73aca3c53be
+Patch0:		makefile.patch
 URL:		http://kokkinizita.linuxaudio.org/linuxaudio/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -26,11 +27,13 @@ Pliki nagłówkowe biblioteki %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__make} \
-	CPPFLAGS="%{rpmcxxflags} %{rpmcppflags} -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" \
-	LDFLAGS="%{rpmldflags}"
+CXX="%{__cxx}" \
+CPPFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/makefile.patch b/makefile.patch
new file mode 100644
index 0000000..df2ea92
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,21 @@
+diff -dur clthreads-2.4.0.orig/Makefile clthreads-2.4.0/Makefile
+--- clthreads-2.4.0.orig/Makefile	2008-03-22 22:48:25.000000000 +0100
++++ clthreads-2.4.0/Makefile	2016-10-15 12:37:50.436941322 +0200
+@@ -28,7 +28,7 @@
+ DISTDIR = clthreads-$(VERSION)
+ 
+ 
+-CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
++CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ LDLFAGS += 
+ LDLIBS +=
+ 
+@@ -42,7 +42,7 @@
+ 
+ 
+ $(CLTHREADS_MIN): $(CLTHREADS_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
+ 
+ 
+ install:	$(CLTHREADS_MIN)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clthreads.git/commitdiff/9a79afbd7639b17679714a28e8807a8db1237f1e



More information about the pld-cvs-commit mailing list