* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pigpio/files/
@ 2020-06-02 4:28 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-06-02 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 617a36c176d37968a9c7b8b0e49435bb4a5fe43f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 26 18:07:49 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 2 04:27:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=617a36c1
dev-libs/pigpio: remove unused file
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15977
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
dev-libs/pigpio/files/pigpiod.systemd | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/dev-libs/pigpio/files/pigpiod.systemd b/dev-libs/pigpio/files/pigpiod.systemd
deleted file mode 100644
index b1d28a66f82..00000000000
--- a/dev-libs/pigpio/files/pigpiod.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Pigpio daemon
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/pigpiod
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pigpio/files/
@ 2020-06-25 8:08 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-06-25 8:08 UTC (permalink / raw
To: gentoo-commits
commit: d11d295f38c134e0cc7f75e1c1017dc759b2a2a0
Author: Daniel Kenzelmann <gentoo <AT> k8n <DOT> de>
AuthorDate: Fri Jun 5 19:02:59 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 08:07:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d11d295f
dev-libs/pigpio: fix SONAME and pre-stripped files, add LDFLAGS
Bring back SONAME/SOVERSION, fix lib links, disable stripping, respect LDFLAGS
Closes: https://bugs.gentoo.org/727044
Closes: https://bugs.gentoo.org/727074
Closes: https://bugs.gentoo.org/723042
Signed-off-by: Daniel Kenzelmann <gentoo <AT> k8n.de>
Closes: https://github.com/gentoo/gentoo/pull/16080
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/pigpio/files/pigpio-70-makefile.patch | 68 +++++++++++++++++---------
1 file changed, 45 insertions(+), 23 deletions(-)
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
index 10df7e872c6..1102fa5b625 100644
--- a/dev-libs/pigpio/files/pigpio-70-makefile.patch
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -1,6 +1,6 @@
---- a/Makefile 2019-08-10 10:10:22.834043361 +0200
-+++ b/Makefile 2019-08-10 10:43:15.797503591 +0200
-@@ -9,6 +9,9 @@
+--- a/Makefile 2020-06-05 20:28:12.691759233 +0200
++++ b/Makefile 2020-06-05 21:23:46.334235268 +0200
+@@ -9,8 +9,12 @@
STRIP = $(CROSS_PREFIX)strip
SHLIB = $(CC) -shared
STRIPLIB = $(STRIP) --strip-unneeded
@@ -9,8 +9,11 @@
+PYTHON3 = $(shell type -P python3 || echo ':' 2> /dev/null)
SOVERSION = 1
++LIBVERSION = 1.0
-@@ -25,7 +28,7 @@
+ CFLAGS += -O3 -Wall -pthread
+
+@@ -25,7 +29,7 @@
LIB = $(LIB1) $(LIB2) $(LIB3)
@@ -19,23 +22,23 @@
LL1 = -L. -lpigpio -pthread -lrt
-@@ -66,28 +69,21 @@
+@@ -66,52 +70,43 @@
$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
pigpiod: pigpiod.o $(LIB1)
- $(CC) -o pigpiod pigpiod.o $(LL1)
+- $(STRIP) pigpiod
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
- $(STRIP) pigpiod
pigs: pigs.o command.o
- $(CC) -o pigs pigs.o command.o
+- $(STRIP) pigs
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
- $(STRIP) pigs
pig2vcd: pig2vcd.o
- $(CC) -o pig2vcd pig2vcd.o
+- $(STRIP) pig2vcd
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
- $(STRIP) pig2vcd
clean:
rm -f *.o *.i *.s *~ $(ALL) *.so.$(SOVERSION)
@@ -51,7 +54,24 @@
install -m 0755 -d $(DESTDIR)$(includedir)
install -m 0644 pigpio.h $(DESTDIR)$(includedir)
install -m 0644 pigpiod_if.h $(DESTDIR)$(includedir)
-@@ -103,15 +99,13 @@
+ install -m 0644 pigpiod_if2.h $(DESTDIR)$(includedir)
+ install -m 0755 -d $(DESTDIR)$(libdir)
+- install -m 0755 libpigpio.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- install -m 0755 libpigpiod_if.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- install -m 0755 libpigpiod_if2.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(SOVERSION) libpigpio.so
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(SOVERSION) libpigpiod_if.so
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(SOVERSION) libpigpiod_if2.so
++ install -m 0755 libpigpio.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ install -m 0755 libpigpiod_if.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ install -m 0755 libpigpiod_if2.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION) libpigpio.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION) libpigpiod_if.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION) libpigpio.so.$(SOVERSION)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION) libpigpiod_if.so.$(SOVERSION)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so.$(SOVERSION)
+ install -m 0755 -d $(DESTDIR)$(bindir)
install -m 0755 pig2vcd $(DESTDIR)$(bindir)
install -m 0755 pigpiod $(DESTDIR)$(bindir)
install -m 0755 pigs $(DESTDIR)$(bindir)
@@ -72,27 +92,29 @@
uninstall:
rm -f $(DESTDIR)$(includedir)/pigpio.h
-@@ -136,19 +130,19 @@
+@@ -136,22 +131,13 @@
endif
$(LIB1): $(OBJ1)
- $(SHLIB) -pthread -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(SOVERSION) $(OBJ1)
-+ $(SHLIB) -o $(LIB1).$(SOVERSION) $(OBJ1)
- ln -fs $(LIB1).$(SOVERSION) $(LIB1)
- $(STRIPLIB) $(LIB1)
- $(SIZE) $(LIB1)
+- ln -fs $(LIB1).$(SOVERSION) $(LIB1)
+- $(STRIPLIB) $(LIB1)
+- $(SIZE) $(LIB1)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(LIBVERSION) $(OBJ1)
$(LIB2): $(OBJ2)
- $(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
-+ $(SHLIB) -o $(LIB2).$(SOVERSION) $(OBJ2)
- ln -fs $(LIB2).$(SOVERSION) $(LIB2)
- $(STRIPLIB) $(LIB2)
- $(SIZE) $(LIB2)
+- ln -fs $(LIB2).$(SOVERSION) $(LIB2)
+- $(STRIPLIB) $(LIB2)
+- $(SIZE) $(LIB2)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(LIBVERSION) $(OBJ2)
$(LIB3): $(OBJ3)
- $(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
-+ $(SHLIB) -o $(LIB3).$(SOVERSION) $(OBJ3)
- ln -fs $(LIB3).$(SOVERSION) $(LIB3)
- $(STRIPLIB) $(LIB3)
- $(SIZE) $(LIB3)
-
+- ln -fs $(LIB3).$(SOVERSION) $(LIB3)
+- $(STRIPLIB) $(LIB3)
+- $(SIZE) $(LIB3)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
+
+ # generated using gcc -MM *.c
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/pigpio/files/
@ 2021-10-04 12:33 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-10-04 12:33 UTC (permalink / raw
To: gentoo-commits
commit: cec3e164dcf496815986706a2a907c09a842dde2
Author: Daniel Kenzelmann <github.com <AT> k8n <DOT> de>
AuthorDate: Sat Sep 25 15:12:32 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 12:32:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec3e164
dev-libs/pigpio: fix broken Makefile
fix broken Makefile, missing linked lib
Signed-off-by: Daniel Kenzelmann <gentoo <AT> k8n.de>
Closes: https://github.com/gentoo/gentoo/pull/22400
Closes: https://bugs.gentoo.org/811150
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/pigpio/files/pigpio-70-makefile.patch | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
index 1102fa5b625..ed3c2283394 100644
--- a/dev-libs/pigpio/files/pigpio-70-makefile.patch
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -92,7 +92,7 @@
uninstall:
rm -f $(DESTDIR)$(includedir)/pigpio.h
-@@ -136,22 +131,13 @@
+@@ -136,22 +131,16 @@
endif
$(LIB1): $(OBJ1)
@@ -101,6 +101,7 @@
- $(STRIPLIB) $(LIB1)
- $(SIZE) $(LIB1)
+ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(LIBVERSION) $(OBJ1)
++ ln -sf $(LIB1).$(LIBVERSION) $(LIB1)
$(LIB2): $(OBJ2)
- $(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
@@ -108,13 +109,15 @@
- $(STRIPLIB) $(LIB2)
- $(SIZE) $(LIB2)
+ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(LIBVERSION) $(OBJ2)
++ ln -sf $(LIB2).$(LIBVERSION) $(LIB2)
$(LIB3): $(OBJ3)
- $(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
- ln -fs $(LIB3).$(SOVERSION) $(LIB3)
- $(STRIPLIB) $(LIB3)
- $(SIZE) $(LIB3)
-+ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
++ ln -sf $(LIB3).$(LIBVERSION) $(LIB3)
# generated using gcc -MM *.c
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-04 12:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-04 12:33 [gentoo-commits] repo/gentoo:master commit in: dev-libs/pigpio/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2020-06-25 8:08 Joonas Niilola
2020-06-02 4:28 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox