summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-12-18 18:32:30 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-12-18 18:37:17 +0100
commit8088fde9f75a64acf8893bbdee4ceaced42c554b (patch)
treed8cfdb7d7a2c7d48e4edb80fd2969e18ff236c0e /dev-libs/libclthreads/files
parentwww-client/chromium: stable channel bump to 79.0.3945.88 (diff)
downloadgentoo-8088fde9f75a64acf8893bbdee4ceaced42c554b.tar.gz
gentoo-8088fde9f75a64acf8893bbdee4ceaced42c554b.tar.bz2
gentoo-8088fde9f75a64acf8893bbdee4ceaced42c554b.zip
media-libs/libclthreads: renamed to dev-libs/libclthreads
Bug: https://bugs.gentoo.org/437186 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-libs/libclthreads/files')
-rw-r--r--dev-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch42
-rw-r--r--dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch33
2 files changed, 75 insertions, 0 deletions
diff --git a/dev-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch b/dev-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
new file mode 100644
index 000000000000..c20ba176d765
--- /dev/null
+++ b/dev-libs/libclthreads/files/libclthreads-2.4.0-Makefile.patch
@@ -0,0 +1,42 @@
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -28,7 +28,7 @@ VERSION = $(MAJVERS).$(MINVERS)
+ 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 +=
+
+@@ -36,22 +36,20 @@ LDLIBS +=
+ CLTHREADS_SO = libclthreads.so
+ CLTHREADS_MAJ = $(CLTHREADS_SO).$(MAJVERS)
+ CLTHREADS_MIN = $(CLTHREADS_MAJ).$(MINVERS)
+-CLTHREADS_DEP = -lpthread
++CLTHREADS_DEP = -lpthread -lrt
+ CLTHREADS_O = p_thread.o a_thread.o itc_mesg.o itc_ip1q.o itc_ctrl.o textmsg.o
+ CLTHREADS_H = clthreads.h
+
+
+ $(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)
+- /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)
+- ln -sf $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)/$(CLTHREADS_SO)
+-
++ /usr/bin/install -D $(CLTHREADS_H) $(DESTDIR)usr/include/$(CLTHREADS_H)
++ /usr/bin/install -D $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
++ ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MAJ)
++ ln -sf $(CLTHREADS_MAJ) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
+
+ clean:
+ /bin/rm -f *~ *.o *.a *.d *.so.*
diff --git a/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch b/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
new file mode 100644
index 000000000000..fa386fff7914
--- /dev/null
+++ b/dev-libs/libclthreads/files/libclthreads-2.4.2-Makefile.patch
@@ -0,0 +1,33 @@
+diff --git a/source/Makefile b/source/Makefile
+index f841f3f..206e607 100644
+--- a/source/Makefile
++++ b/source/Makefile
+@@ -32,8 +32,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,12 +50,12 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
+
+
+ install: $(CLTHREADS_MIN)
+- install -d $(DESTDIR)$(PREFIX)/$(INCDIR)
+- install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
+- install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR)
+- install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)
+- ldconfig
+- ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO)
++ install -d $(DESTDIR)${PREFIX}/$(INCDIR)
++ install -d $(DESTDIR)${PREFIX}/$(LIBDIR)
++ install -m 644 $(CLTHREADS_H) $(DESTDIR)${PREFIX}/$(INCDIR)
++ install -m 755 $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)
++ ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_SO)
++ ln -sf $(CLTHREADS_MIN) $(DESTDIR)${PREFIX}/$(LIBDIR)/$(CLTHREADS_MAJ)
+
+ uninstall:
+ rm -rf $(DESTDIR)$(INCDIR)/$(CLTHREADS_H)