diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch b/recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch index 174e256d..7cf4f0ed 100644 --- a/recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch +++ b/recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch @@ -1,7 +1,7 @@ From 566cc7e03386a012b0e63b4cfe19632685070957 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 2 Aug 2017 16:18:09 +0200 -Subject: [PATCH] Align Makefile +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 1 Nov 2018 19:02:52 +0100 +Subject: [PATCH] Align source/Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -11,35 +11,51 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- - Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + source/Makefile | 13 ++++--------- + 1 file changed, 4 insertions(+), 9 deletions(-) -diff --git a/Makefile b/Makefile -index 86d417e..f56044b 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,14 +42,14 @@ CLTHREADS_H = clthreads.h +diff --git a/source/Makefile b/source/Makefile +index f841f3f..e30e81a 100644 +--- a/source/Makefile ++++ b/source/Makefile +@@ -20,10 +20,6 @@ + + # Modify as required. + # +-SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/') +-PREFIX ?= /usr/local +-INCDIR ?= $(PREFIX)/include +-LIBDIR ?= $(PREFIX)/lib$(SUFFIX) - $(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) + MAJVERS = 2 +@@ -32,8 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS) + + + CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I. +-CXXFLAGS += -Wall -O2 -fPIC +-CXXFLAGS += -march=native ++CXXFLAGS += -Wall -fPIC + LDLFAGS += + LDLIBS += + +@@ -51,11 +46,11 @@ $(CLTHREADS_MIN): $(CLTHREADS_O) install: $(CLTHREADS_MIN) -- /usr/bin/install -d $(PREFIX)/$(LIBDIR) -- /usr/bin/install -m 644 $(CLTHREADS_H) $(PREFIX)/include -- /usr/bin/install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR) -- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) -+ install -d $(PREFIX)/$(LIBDIR) -+ install -m 644 $(CLTHREADS_H) $(PREFIX)/include -+ install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR) -+ ldconfig -n $(PREFIX)/$(LIBDIR) - ln -sf $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)/$(CLTHREADS_SO) - +- install -d $(DESTDIR)$(PREFIX)/$(INCDIR) +- install -d $(DESTDIR)$(PREFIX)/$(LIBDIR) ++ install -d $(DESTDIR)$(INCDIR) ++ install -d $(DESTDIR)$(LIBDIR) + install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR) + install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR) +- ldconfig ++ ldconfig -n $(DESTDIR)$(LIBDIR) + ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO) + uninstall: -- -2.9.4 +2.14.4 diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb b/recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.2.bb similarity index 57% rename from recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb rename to recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.2.bb index e2e4f2ba..a20cbc17 100644 --- a/recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb +++ b/recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.2.bb @@ -9,11 +9,15 @@ SRC_URI = " \ http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${BPN}-${PV}.tar.bz2 \ file://0001-Align-Makefile.patch \ " -SRC_URI[md5sum] = "90b650f1f5c9f39f4d77f73aca3c53be" -SRC_URI[sha256sum] = "a69fd566af24b85a10c5ecd957a85b7f5eb1c56995d2b999219b52f353ea1de9" +SRC_URI[md5sum] = "6c82e4edece2db2de9451b6afe702a86" +SRC_URI[sha256sum] = "c659b14c0c4055c44432cb83060b95d30ae0c1ecc6f50d73968e239c100f7a31" +do_compile() { + cd ${S}/source + base_do_compile +} do_install() { - install -d "${D}${prefix}/include" - oe_runmake 'PREFIX=${D}${prefix}' 'LIBDIR=${baselib}' install + cd ${S}/source + oe_runmake 'DESTDIR=${D}' 'LIBDIR=${libdir}' 'INCDIR=${includedir}' install }