* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
@ 2020-11-28 1:08 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-11-28 1:08 UTC (permalink / raw
To: gentoo-commits
commit: 22efecc44666d3ed9050ac4a6895b94f35c3510b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 01:08:19 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 01:08:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22efecc4
net-libs/liblockfile: fix Darwin makefile
* Don't install directly into $(ROOT) (!).
Instead install into $(DESTDIR), which will, among other benefits,
allow Portage to detect collisions.
(noticed when tried to install twice and a symlink failed!)
* Respect AR
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/liblockfile/files/Makefile.Darwin.in | 29 ++++++++++++++++++---------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
index 936d48a2d1d..f466f9ca50e 100644
--- a/net-libs/liblockfile/files/Makefile.Darwin.in
+++ b/net-libs/liblockfile/files/Makefile.Darwin.in
@@ -10,6 +10,7 @@ NVER = 0.1
CFLAGS = @CFLAGS@ -I.
LDFLAGS = @LDFLAGS@
+AR = @AR@
CC = @CC@
prefix = @prefix@
@@ -30,7 +31,7 @@ shared: liblockfile.dylib dotlockfile
nfslib: nfslock.$(VER).dylib
liblockfile.a: lockfile.o
- ar rv liblockfile.a lockfile.o
+ $(AR) rv liblockfile.a lockfile.o
liblockfile.dylib: liblockfile.a
$(CC) $(LDFLAGS) -fPIC -dynamiclib -install_name @libdir@/liblockfile.1.0.dylib \
@@ -51,25 +52,33 @@ xlockfile.o: lockfile.c
$(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" -c lockfile.c -o xlockfile.o
install_static: static install_common
- install -m 644 liblockfile.a $(ROOT)$(libdir)
+ install -d $(DESTDIR)$(libdir)
+ install -m 644 liblockfile.a $(DESTDIR)$(libdir)
install_shared: shared install_common
+ install -d $(DESTDIR)$(libdir)
install -m 755 liblockfile.dylib \
- $(ROOT)$(libdir)/liblockfile.$(VER).dylib
- ln -s liblockfile.$(VER).dylib $(ROOT)$(libdir)/liblockfile.dylib
+ $(DESTDIR)$(libdir)/liblockfile.$(VER).dylib
+ ln -s liblockfile.$(VER).dylib $(DESTDIR)$(libdir)/liblockfile.dylib
install_common:
- install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
+ install -d $(DESTDIR)$(includedir)
+ install -d $(DESTDIR)$(bindir)
+ install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
if [ "$(MAILGROUP)" != "" ]; then\
- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
+ install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
else \
- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \
+ install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
fi
- install -m 644 *.1 $(ROOT)$(mandir)/man1
- install -m 644 *.3 $(ROOT)$(mandir)/man3
+ install -d $(DESTDIR)$(mandir)
+ install -d $(DESTDIR)$(mandir)/man1
+ install -d $(DESTDIR)$(mandir)/man3
+ install -m 644 *.1 $(DESTDIR)$(mandir)/man1
+ install -m 644 *.3 $(DESTDIR)$(mandir)/man3
install_nfslib: nfslib
- install -m 755 nfslock.$(VER).dylib $(ROOT)$(nfslockdir)
+ install -d $(DESTDIR)$(nfslockdir)
+ install -m 755 nfslock.$(VER).dylib $(DESTDIR)$(nfslockdir)
clean:
rm -f *.a *.o *.dylib dotlockfile
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
@ 2020-11-28 0:52 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2020-11-28 0:52 UTC (permalink / raw
To: gentoo-commits
commit: a93170144777642a7878a0f2a27c6802a982b903
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 00:52:10 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 00:52:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9317014
net-libs/liblockfile: fix build failure
"lockfile.c:57:11: error: ‘LOCKPROG’ undeclared (first use in this function)"
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-libs/liblockfile/files/Makefile.Darwin.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/liblockfile/files/Makefile.Darwin.in b/net-libs/liblockfile/files/Makefile.Darwin.in
index bdd320fe6d4..936d48a2d1d 100644
--- a/net-libs/liblockfile/files/Makefile.Darwin.in
+++ b/net-libs/liblockfile/files/Makefile.Darwin.in
@@ -48,7 +48,7 @@ lockfile.o: lockfile.c
-c lockfile.c
xlockfile.o: lockfile.c
- $(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
+ $(CC) $(CFLAGS) -DLOCKPROG=\"$(bindir)/dotlockfile\" -c lockfile.c -o xlockfile.o
install_static: static install_common
install -m 644 liblockfile.a $(ROOT)$(libdir)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
@ 2020-05-06 11:51 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-05-06 11:51 UTC (permalink / raw
To: gentoo-commits
commit: 66305b3eed52830c08afdfea60ecfa165e31dcdc
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 5 12:57:01 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed May 6 11:51:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66305b3e
net-libs/liblockfile: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/liblockfile-1.06-respectflags.patch | 18 ------------------
.../liblockfile/files/liblockfile-orphan-file.patch | 19 -------------------
2 files changed, 37 deletions(-)
diff --git a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch b/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
deleted file mode 100644
index 1a8d0eb18cb..00000000000
--- a/net-libs/liblockfile/files/liblockfile-1.06-respectflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: liblockfile-1.06/Makefile.in
-===================================================================
---- liblockfile-1.06.orig/Makefile.in
-+++ liblockfile-1.06/Makefile.in
-@@ -32,11 +32,11 @@ liblockfile.a: lockfile.o
- ar rv liblockfile.a lockfile.o
-
- liblockfile.so: liblockfile.a
-- $(CC) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
-+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
- -o liblockfile.so lockfile.o -lc
-
- nfslock.so.$(VER): nfslock.o
-- $(CC) -fPIC -shared -Wl,-soname,nfslock.so.0 \
-+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
- -o nfslock.so.$(NVER) nfslock.o
-
- dotlockfile: dotlockfile.o xlockfile.o
diff --git a/net-libs/liblockfile/files/liblockfile-orphan-file.patch b/net-libs/liblockfile/files/liblockfile-orphan-file.patch
deleted file mode 100644
index 4a8c75ac412..00000000000
--- a/net-libs/liblockfile/files/liblockfile-orphan-file.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur liblockfile-1.06-orig/Makefile.in liblockfile-1.06/Makefile.in
---- liblockfile-1.06-orig/Makefile.in 2006-11-28 06:19:09.000000000 +0100
-+++ liblockfile-1.06/Makefile.in 2006-11-28 06:24:30.000000000 +0100
-@@ -5,6 +5,7 @@
- #
-
- VER = 1.0
-+MVER = 1
- NVER = 0.1
-
- CFLAGS = @CFLAGS@ -I.
-@@ -55,6 +56,7 @@
- install_shared: shared install_common
- install -m 755 liblockfile.so \
- $(ROOT)$(libdir)/liblockfile.so.$(VER)
-+ ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so.$(MVER)
- ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
- if test "$(ROOT)" = ""; then @LDCONFIG@; fi
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
@ 2019-08-14 12:15 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2019-08-14 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 6a7a47eb486af8ef1b3a1e87e87e9c4784075132
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 12:11:41 2019 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 12:13:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7a47eb
net-libs/liblockfile: fix Makefile patch for prefix
Closes: https://bugs.gentoo.org/692132
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
.../liblockfile/files/liblockfile-1.16-makefile.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
index 656ccd3c494..1994680be77 100644
--- a/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
+++ b/net-libs/liblockfile/files/liblockfile-1.16-makefile.patch
@@ -29,12 +29,12 @@ index 2721b48..798c603 100644
install_static: static install_common
- install -d -m 755 -g root -p $(libdir)
- install -m 644 liblockfile.a $(libdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++ install -d -m 755 -p $(DESTDIR)$(libdir)
+ install -m 644 liblockfile.a $(DESTDIR)$(libdir)
install_shared: shared install_static install_common
- install -d -m 755 -g root -p $(libdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++ install -d -m 755 -p $(DESTDIR)$(libdir)
install -m 755 liblockfile.so \
- $(libdir)/liblockfile.so.$(SOVER)
- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
@@ -50,17 +50,17 @@ index 2721b48..798c603 100644
- install -d -m 755 -g root -p $(mandir)/man1
- install -d -m 755 -g root -p $(mandir)/man3
- install -m 644 lockfile.h maillock.h $(includedir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(includedir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(bindir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
-+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man3
++ install -d -m 755 -p $(DESTDIR)$(includedir)
++ install -d -m 755 -p $(DESTDIR)$(bindir)
++ install -d -m 755 -p $(DESTDIR)$(mandir)/man1
++ install -d -m 755 -p $(DESTDIR)$(mandir)/man3
+ install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
if [ "$(MAILGROUP)" != "" ]; then\
- install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
+ install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
else \
- install -g root -m 755 dotlockfile $(bindir); \
-+ install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
++ install -m 755 dotlockfile $(DESTDIR)$(bindir); \
fi
- install -m 644 *.1 $(mandir)/man1
- install -m 644 *.3 $(mandir)/man3
@@ -70,7 +70,7 @@ index 2721b48..798c603 100644
install_nfslib: nfslib
- install -d -m 755 -g root -p $(nfslockdir)
- install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(nfslockdir)
++ install -d -m 755 -p $(DESTDIR)$(nfslockdir)
+ install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/
@ 2017-09-15 5:45 Benda XU
0 siblings, 0 replies; 5+ messages in thread
From: Benda XU @ 2017-09-15 5:45 UTC (permalink / raw
To: gentoo-commits
commit: 87a9ea0654a3c293631ac8eca64611fd942067c6
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 05:44:12 2017 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 05:45:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a9ea06
net-libs/liblockfile: remove hardcoded group root
In vanilla gentoo, the installed files has group root
by default. In Prefix, the hardcoded group usually
results in "Permission Denied" error.
Credit: William Throwe, Didier Colle
Closes: https://bugs.gentoo.org/605298
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../liblockfile/files/liblockfile-1.13-makefile.patch | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
index f325b5e7dff..e14bf12ad31 100644
--- a/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
+++ b/net-libs/liblockfile/files/liblockfile-1.13-makefile.patch
@@ -15,12 +15,12 @@
install_static: static install_common
- install -d -m 755 -g root -p $(libdir)
- install -m 644 liblockfile.a $(libdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++ install -d -m 755 -p $(DESTDIR)$(libdir)
+ install -m 644 liblockfile.a $(DESTDIR)$(libdir)
install_shared: shared install_static install_common
- install -d -m 755 -g root -p $(libdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(libdir)
++ install -d -m 755 -p $(DESTDIR)$(libdir)
install -m 755 liblockfile.so \
- $(libdir)/liblockfile.so.$(SOVER)
- ln -s liblockfile.so.$(SOVER) $(libdir)/liblockfile.so.$(MAJOR)
@@ -36,17 +36,17 @@
- install -d -m 755 -g root -p $(mandir)/man1
- install -d -m 755 -g root -p $(mandir)/man3
- install -m 644 lockfile.h maillock.h $(includedir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(includedir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(bindir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man1
-+ install -d -m 755 -g root -p $(DESTDIR)$(mandir)/man3
++ install -d -m 755 -p $(DESTDIR)$(includedir)
++ install -d -m 755 -p $(DESTDIR)$(bindir)
++ install -d -m 755 -p $(DESTDIR)$(mandir)/man1
++ install -d -m 755 -p $(DESTDIR)$(mandir)/man3
+ install -m 644 lockfile.h maillock.h $(DESTDIR)$(includedir)
if [ "$(MAILGROUP)" != "" ]; then\
- install -g $(MAILGROUP) -m 2755 dotlockfile $(bindir);\
+ install -g $(MAILGROUP) -m 2755 dotlockfile $(DESTDIR)$(bindir);\
else \
- install -g root -m 755 dotlockfile $(bindir); \
-+ install -g root -m 755 dotlockfile $(DESTDIR)$(bindir); \
++ install -m 755 dotlockfile $(DESTDIR)$(bindir); \
fi
- install -m 644 *.1 $(mandir)/man1
- install -m 644 *.3 $(mandir)/man3
@@ -56,7 +56,7 @@
install_nfslib: nfslib
- install -d -m 755 -g root -p $(nfslockdir)
- install -m 755 nfslock.so.$(NFSVER) $(nfslockdir)
-+ install -d -m 755 -g root -p $(DESTDIR)$(nfslockdir)
++ install -d -m 755 -p $(DESTDIR)$(nfslockdir)
+ install -m 755 nfslock.so.$(NFSVER) $(DESTDIR)$(nfslockdir)
if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-28 1:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-28 1:08 [gentoo-commits] repo/gentoo:master commit in: net-libs/liblockfile/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-11-28 0:52 Sam James
2020-05-06 11:51 Joonas Niilola
2019-08-14 12:15 Guilherme Amadio
2017-09-15 5:45 Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox