summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2020-01-05 23:29:24 +0000
committerEric Hameleers <alien@slackware.com>2020-01-06 08:59:50 +0100
commitb372ffbf0854591a6c78f9a47a135fbbb82423d2 (patch)
tree1dec505b1c25640a14462aba3ba4d83b1cfcdde9 /source/l
parent4f5eb0f5505bf4c6361e2b2ebea465b559006a7e (diff)
downloadcurrent-b372ffbf0854591a6c78f9a47a135fbbb82423d2.tar.gz
Sun Jan 5 23:29:24 UTC 202020200105232924
l/imagemagick-7.0.9_14-x86_64-1.txz: Upgraded. l/libcap-2.30-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
-rwxr-xr-xsource/l/libcap/libcap.SlackBuild5
-rw-r--r--source/l/libcap/libcap.golang.install.source.path.diff14
2 files changed, 1 insertions, 18 deletions
diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild
index 8cf4f16e..e0f3ef4a 100755
--- a/source/l/libcap/libcap.SlackBuild
+++ b/source/l/libcap/libcap.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2009, 2010, 2011, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -92,9 +92,6 @@ sed -i.orig "s/^\(DEBUG =\).*/\1$SLKCFLAGS/" Make.Rules
# Disable broken gperf support:
sed 's@^BUILD_GPERF@#\0@' -i Make.Rules
-# Fix installing Go objects:
-zcat $CWD/libcap.golang.install.source.path.diff.gz | patch -p1 --verbose || exit 1
-
make DYNAMIC=yes GOLANG=$GOSUPPORT || exit 1
make install RAISE_SETFCAP=no GOLANG=$GOSUPPORT DESTDIR=$PKG man_prefix=/usr || exit 1
chmod 755 $PKG/lib${LIBDIRSUFFIX}/libcap.so*
diff --git a/source/l/libcap/libcap.golang.install.source.path.diff b/source/l/libcap/libcap.golang.install.source.path.diff
deleted file mode 100644
index 5cb54f00..00000000
--- a/source/l/libcap/libcap.golang.install.source.path.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./libcap/Makefile.orig 2019-12-22 18:12:31.000000000 -0600
-+++ ./libcap/Makefile 2019-12-27 13:07:04.168648079 -0600
-@@ -88,9 +88,9 @@
- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
- ifeq ($(GOLANG),yes)
- mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/cap
-- install -m 0644 src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/
-+ install -m 0644 ../go/src/libcap/cap/* $(FAKEROOT)$(GOPKGDIR)/libcap/cap/
- mkdir -p -m 0755 $(FAKEROOT)$(GOPKGDIR)/libcap/psx
-- install -m 0644 src/libcap/psx/* $(FAKEROOT)$(GOPKGDIR)/libcap/psx/
-+ install -m 0644 ../go/src/libcap/psx/* $(FAKEROOT)$(GOPKGDIR)/libcap/psx/
- endif
-
- clean: