pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/53806: Update heimdal 1.5.3 package to allow installation on WSL hosted Ubuntu
Here is the patch from the file you sent:
--- /usr/pkgsrc/mk/bsd.prefs.mk 2018-12-11 14:48:58.832741256 +0100
+++ mk/bsd.prefs.mk 2018-12-07 14:40:10.000000000 +0100
@@ -226,7 +226,11 @@
LOWER_VENDOR?= pc
. endif
LOWER_VENDOR?= unknown
+OS_VARIANT!= ${UNAME} -r
+OS_VARIANT:= ${OS_VARIANT:C/^.*-//}
+. if ${OS_VARIANT} != "Microsoft"
OS_VARIANT= ${LOWER_VENDOR}
+. endif
. if !defined(HOST_MACHINE_ARCH)
HOST_MACHINE_ARCH!= ${UNAME} -m
MAKEFLAGS+= HOST_MACHINE_ARCH=${HOST_MACHINE_ARCH:Q}
--- /usr/pkgsrc/security/heimdal/Makefile 2018-12-11 14:49:14.568214443 +0100
+++ security/heimdal/Makefile 2018-12-10 14:52:50.000000000 +0100
@@ -73,15 +73,21 @@
PLIST.glob= yes
.endif
+PLIST_VARS+= hcrypto
# Linux does not have include/vis.h and expected include/glob.h.
.if ${OPSYS} == "Linux"
PLIST.vis= yes
PLIST.glob= yes
# Without this I get undefined references to pthread_getspecific
PTHREAD_AUTO_VARS= yes
+.if ${OS_VARIANT} == "Microsoft"
+# On Ubuntu hosted via WSL this is needed to avoid a DESTDIR/PLIST
+# conflict error.
+PLIST.hcrypto= yes
+.endif
.endif
-PLIST_VARS+= afskauth hcrypto
+PLIST_VARS+= afskauth
.if ${OPSYS} == "IRIX"
PLIST.afskauth= yes
.endif
Home |
Main Index |
Thread Index |
Old Index