summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-05-10 16:01:05 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-05-10 16:03:47 +0200
commita239f3e794eedb568c7559a44fa6ffd81d76f7bf (patch)
treef428dc99f40e33187d6ab13fe024b141ba32f20a /dev-libs/libcli/files
parentx11-wm/i3-gaps: x86 stable (bug #684854) (diff)
downloadgentoo-a239f3e794eedb568c7559a44fa6ffd81d76f7bf.tar.gz
gentoo-a239f3e794eedb568c7559a44fa6ffd81d76f7bf.tar.bz2
gentoo-a239f3e794eedb568c7559a44fa6ffd81d76f7bf.zip
dev-libs/libcli: Bump to version 1.9.8.4
Closes: https://bugs.gentoo.org/569848 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-libs/libcli/files')
-rw-r--r--dev-libs/libcli/files/libcli-1.9.4-ldflags.patch4
-rw-r--r--dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch29
2 files changed, 31 insertions, 2 deletions
diff --git a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
index 0dd8e13d67fc..4b78c0ddb287 100644
--- a/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
+++ b/dev-libs/libcli/files/libcli-1.9.4-ldflags.patch
@@ -1,5 +1,5 @@
---- Makefile~ 2008-07-28 03:13:16.000000000 +0200
-+++ Makefile 2010-09-12 15:39:05.000000000 +0200
+--- a/Makefile
++++ b/Makefile
@@ -28,7 +28,7 @@
libcli.o: libcli.h
diff --git a/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
new file mode 100644
index 000000000000..31c5024cb7bf
--- /dev/null
+++ b/dev-libs/libcli/files/libcli-1.9.8.4-libdir.patch
@@ -0,0 +1,29 @@
+--- libcli-1.9.8-4/Makefile
++++ libcli-1.9.8-4/Makefile
+@@ -8,6 +8,7 @@
+ UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
+ DESTDIR =
+ PREFIX = /usr/local
++libdir = $(PREFIX)/lib
+
+ MAJOR = 1
+ MINOR = 9
+@@ -64,14 +65,14 @@
+ rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz
+
+ install: $(TARGET_LIBS)
+- install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
++ install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(libdir)
+ install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
+ ifeq (1,$(STATIC_LIB))
+- install -m 0644 $(LIB_STATIC) $(DESTDIR)$(PREFIX)/lib
++ install -m 0644 $(LIB_STATIC) $(DESTDIR)$(libdir)
+ endif
+ ifeq (1,$(DYNAMIC_LIB))
+- install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
+- cd $(DESTDIR)$(PREFIX)/lib && \
++ install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(libdir)
++ cd $(DESTDIR)$(libdir) && \
+ ln -fs $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
+ ln -fs $(LIB).$(MAJOR).$(MINOR) $(LIB)
+ endif