pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Drop platform specific binaries.
Module Name: pkgsrc-wip
Committed By: Roy Marples <roy%marples.name@localhost>
Pushed By: roy
Date: Fri Jan 1 03:13:44 2021 +0000
Changeset: 2efff5be0e42269c8fd8136afeb6fd6f5afed9f6
Modified Files:
unifi6/Makefile
unifi6/PLIST
Added Files:
unifi6/PLIST.Darwin-x86_64
unifi6/PLIST.Linux-aarch64
unifi6/PLIST.Linux-armv7
unifi6/PLIST.Linux-x86_64
Log Message:
Drop platform specific binaries.
As far as we know, they are only for Cloud access to the controller.
These binaries are built using libgcc_s.1 and pkgsrc will complain
that this library is missing on the install target if wasn't built
using gcc *even* if these libraries are not native.
This is likely a pkgsrc bug, but we really shouldn't be installing
these anyway.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2efff5be0e42269c8fd8136afeb6fd6f5afed9f6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
unifi6/Makefile | 25 +++++++++++++++++++++++++
unifi6/PLIST | 8 --------
unifi6/PLIST.Darwin-x86_64 | 1 +
unifi6/PLIST.Linux-aarch64 | 2 ++
unifi6/PLIST.Linux-armv7 | 2 ++
unifi6/PLIST.Linux-x86_64 | 2 ++
6 files changed, 32 insertions(+), 8 deletions(-)
diffs:
diff --git a/unifi6/Makefile b/unifi6/Makefile
index 4db23d68d7..ddcc6a336e 100644
--- a/unifi6/Makefile
+++ b/unifi6/Makefile
@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.19 2020/08/30 06:03:53 tnn Exp $
DISTNAME= unifi-6.0.43
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= -http://dl.ubnt.com/unifi/${PKGVERSION_NOREV}/UniFi.unix.zip
EXTRACT_SUFX= .zip
@@ -76,6 +77,30 @@ post-extract:
find ${WRKSRC} -type f -print0 | xargs -0 chmod -x
mkdir ${WRKDIR}/${SNAPPY_JAVA}/target
ln -s ${WRKDIR}/${SNAPPY} ${WRKDIR}/${SNAPPY_JAVA}/target
+# drop platform specific binaries
+# as far as we know, these are for cloud access to your controller
+ ls -R ${WRKDIR}/UniFi/lib/native
+ rm -rf ${WRKDIR}/UniFi/lib/native/Windows
+.if (${OPSYS} != "Linux")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Linux
+.else
+.if (${MACHINE_ARCH} != "aarch64")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Linux/aarch64
+.endif
+.if (${MACHINE_ARCH} != "armv7")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Linux/armv7
+.endif
+.if (${MACHINE_ARCH} != "x86_64")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Linux/x86_64
+.endif
+.endif
+.if (${OPSYS} != "Darwin")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Mac
+.else
+.if (${MACHINE_ARCH} != "x86_64")
+ rm -rf ${WRKDIR}/UniFi/lib/native/Mac/x86_64
+.endif
+.endif
do-build:
# bundled mongod is a linux binary; replace with symlink to native binary
diff --git a/unifi6/PLIST b/unifi6/PLIST
index 9bcfc5d582..7eec45696f 100644
--- a/unifi6/PLIST
+++ b/unifi6/PLIST
@@ -82,14 +82,6 @@ unifi/lib/log4j-api-2.13.3.jar
unifi/lib/log4j-core-2.13.3.jar
unifi/lib/log4j-slf4j-impl-2.13.3.jar
unifi/lib/mongo-java-driver-3.4.3.jar
-unifi/lib/native/Linux/aarch64/libubnt_sdnotify_jni.so
-unifi/lib/native/Linux/aarch64/libubnt_webrtc_jni.so
-unifi/lib/native/Linux/armv7/libubnt_sdnotify_jni.so
-unifi/lib/native/Linux/armv7/libubnt_webrtc_jni.so
-unifi/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so
-unifi/lib/native/Linux/x86_64/libubnt_webrtc_jni.so
-unifi/lib/native/Mac/x86_64/libubnt_webrtc_jni.dylib
-unifi/lib/native/Windows/x86_64/ubnt_webrtc_jni.dll
unifi/lib/openssh-1.0.jar
unifi/lib/org.eclipse.paho.client.mqttv3-1.1.0.jar
unifi/lib/owasp-java-html-sanitizer-20190503.1.jar
diff --git a/unifi6/PLIST.Darwin-x86_64 b/unifi6/PLIST.Darwin-x86_64
new file mode 100644
index 0000000000..9e37bbb30e
--- /dev/null
+++ b/unifi6/PLIST.Darwin-x86_64
@@ -0,0 +1 @@
+unifi/lib/native/Mac/x86_64/libubnt_webrtc_jni.dylib
diff --git a/unifi6/PLIST.Linux-aarch64 b/unifi6/PLIST.Linux-aarch64
new file mode 100644
index 0000000000..7b54421063
--- /dev/null
+++ b/unifi6/PLIST.Linux-aarch64
@@ -0,0 +1,2 @@
+unifi/lib/native/Linux/aarch64/libubnt_sdnotify_jni.so
+unifi/lib/native/Linux/aarch64/libubnt_webrtc_jni.so
diff --git a/unifi6/PLIST.Linux-armv7 b/unifi6/PLIST.Linux-armv7
new file mode 100644
index 0000000000..148afc51d3
--- /dev/null
+++ b/unifi6/PLIST.Linux-armv7
@@ -0,0 +1,2 @@
+unifi/lib/native/Linux/armv7/libubnt_sdnotify_jni.so
+unifi/lib/native/Linux/armv7/libubnt_webrtc_jni.so
diff --git a/unifi6/PLIST.Linux-x86_64 b/unifi6/PLIST.Linux-x86_64
new file mode 100644
index 0000000000..02e7b7bf77
--- /dev/null
+++ b/unifi6/PLIST.Linux-x86_64
@@ -0,0 +1,2 @@
+unifi/lib/native/Linux/x86_64/libubnt_sdnotify_jni.so
+unifi/lib/native/Linux/x86_64/libubnt_webrtc_jni.so
Home |
Main Index |
Thread Index |
Old Index