[patch] patch needed for 3.16 ebuild

lxd-3.16-libco-makefile-and-pc.patch (text/plain), 2.22 KB, created by fling on 2019-11-12 07:18:17 UTC

diff -ruN lxd-3.16.old/_dist/deps/libco/Makefile lxd-3.16/_dist/deps/libco/Makefile
--- lxd-3.16.old/_dist/deps/libco/Makefile	2019-08-10 00:05:02.000000000 -0000
+++ lxd-3.16/_dist/deps/libco/Makefile	2019-11-05 15:52:30.839949118 -0000
@@ -1,5 +1,28 @@
-.PHONY: all
+.PHONY: all install
+
+DESTDIR ?=
+PREFIX ?= /usr
+INCLUDEDIR ?= include
+LIBDIR ?= lib
+MAJ = 0
+MIN = 0.0.1
+
 all:
-	$(CC) -c -Wall -fpic libco.c
-	$(CC) -shared -o libco.so libco.o
+	$(CC) $(CFLAGS) libco.c -c -Wall -fpic -DLIBCO_MP
+	$(CC) $(CFLAGS) $(LDFLAGS) libco.o -shared -Wl,-soname,libco.so.$(MAJ) -o libco.so.$(MIN)
 	$(AR) rcs libco.a libco.o
+	sed -e "s|@prefix@|$(PREFIX)|g" \
+	    -e "s|@libdir@|$(PREFIX)/$(LIBDIR)|g" \
+	    -e "s|@includedir@|$(PREFIX)/$(INCLUDEDIR)|g" \
+	    libco.pc.in > libco.pc
+
+install:
+	install -d $(DESTDIR)$(PREFIX)/$(INCLUDEDIR)/
+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/
+	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/pkgconfig/
+	install -m 0664 libco.so.$(MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libco.so.$(MIN)
+	install -m 0664 libco.pc $(DESTDIR)$(PREFIX)/$(LIBDIR)/pkgconfig/
+	ln -s libco.so.$(MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libco.so.$(MAJ)
+	ln -s libco.so.$(MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libco.so
+	install -m 0664 libco.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/
+	install -m 0664 libco.h $(DESTDIR)$(PREFIX)/$(INCLUDEDIR)/
diff -ruN lxd-3.16.old/_dist/deps/libco/libco.pc lxd-3.16/_dist/deps/libco/libco.pc
--- lxd-3.16.old/_dist/deps/libco/libco.pc	2019-08-10 00:05:02.000000000 -0000
+++ lxd-3.16/_dist/deps/libco/libco.pc	1970-01-01 00:00:00.000000000 -0000
@@ -1,9 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib/
-includedir=${prefix}/include
-
-Name: libco
-Description: Cooperative multithreading library written in C89C
-Version: 18
-Libs: -L${libdir} -lco
-Cflags: -I${includedir}
diff -ruN lxd-3.16.old/_dist/deps/libco/libco.pc.in lxd-3.16/_dist/deps/libco/libco.pc.in
--- lxd-3.16.old/_dist/deps/libco/libco.pc.in	1970-01-01 00:00:00.000000000 -0000
+++ lxd-3.16/_dist/deps/libco/libco.pc.in	2019-11-05 15:52:30.843949025 -0000
@@ -0,0 +1,9 @@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libco
+Description: Cooperative multithreading library written in C89C
+Version: 17
+Libs: -L${libdir} -lco
+Cflags: -I${includedir}