pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust-bin: Fix PLIST on platforms other than Darwin



Module Name:	pkgsrc-wip
Committed By:	Min Kim <minskim%NetBSD.org@localhost>
Pushed By:	minskim
Date:		Sat Dec 22 13:26:24 2018 -0800
Changeset:	092f501c367e37d556fea39a3a84fea448379d91

Modified Files:
	rust-bin/Makefile
	rust-bin/PLIST.common

Log Message:
rust-bin: Fix PLIST on platforms other than Darwin

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=092f501c367e37d556fea39a3a84fea448379d91

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust-bin/Makefile     |  7 ++++++
 rust-bin/PLIST.common | 65 ++++++++++++++++++++++++++-------------------------
 2 files changed, 40 insertions(+), 32 deletions(-)

diffs:
diff --git a/rust-bin/Makefile b/rust-bin/Makefile
index dc848897a7..90de6cc89b 100644
--- a/rust-bin/Makefile
+++ b/rust-bin/Makefile
@@ -25,6 +25,13 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR} share/doc/cargo/bash_completion.d
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_VARS+=	darwin nondarwin
+.if ${OPSYS} == "Darwin"
+PLIST.darwin=		yes
+.else
+PLIST.nondarwin=	yes
+.endif
+
 DISTFILES:=	# empty
 
 .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make(makesum) || make(mdi)
diff --git a/rust-bin/PLIST.common b/rust-bin/PLIST.common
index e43b1316ce..0102e06c0b 100644
--- a/rust-bin/PLIST.common
+++ b/rust-bin/PLIST.common
@@ -15,10 +15,10 @@ lib/rustlib/etc/gdb_load_rust_pretty_printers.py
 lib/rustlib/etc/gdb_rust_pretty_printing.py
 lib/rustlib/etc/lldb_rust_formatters.py
 lib/rustlib/rust-installer-version
-lib/rustlib/${RUST_ARCH}/bin/lldb
-lib/rustlib/${RUST_ARCH}/bin/lldb-argdumper
-lib/rustlib/${RUST_ARCH}/bin/lldb-mi
-lib/rustlib/${RUST_ARCH}/bin/lldb-server
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/bin/lldb
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/bin/lldb-argdumper
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/bin/lldb-mi
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/bin/lldb-server
 lib/rustlib/${RUST_ARCH}/bin/llvm-nm
 lib/rustlib/${RUST_ARCH}/bin/llvm-objcopy
 lib/rustlib/${RUST_ARCH}/bin/llvm-objdump
@@ -29,34 +29,35 @@ lib/rustlib/${RUST_ARCH}/bin/llvm-strip
 lib/rustlib/${RUST_ARCH}/bin/rust-lld
 lib/rustlib/${RUST_ARCH}/codegen-backends/librustc_codegen_llvm-emscripten.so
 lib/rustlib/${RUST_ARCH}/codegen-backends/librustc_codegen_llvm-llvm.so
-lib/rustlib/${RUST_ARCH}/lib/libLLVM.so
-lib/rustlib/${RUST_ARCH}/lib/liblldb.so.8.0.0
-lib/rustlib/${RUST_ARCH}/lib/liblldb.so
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/_lldb.so
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/diagnose_nsstring.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/diagnose_unwind.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/embedded_interpreter.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/Logger.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/attrib_fromdict.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cache.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/gnu_libstdcpp.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/libcxx.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/metrics.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/synth.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/lldb-argdumper
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/crashlog.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap/Makefile
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap/heap_find.cpp
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/runtime/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/utils/__init__.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/utils/symbolication.py
-lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/six.py
+${PLIST.nondarwin}lib/rustlib/${RUST_ARCH}/lib/libLLVM-8svn.so
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/libLLVM.so
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/liblldb.so.8.0.0
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/liblldb.so
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/_lldb.so
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/diagnose_nsstring.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/diagnose/diagnose_unwind.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/embedded_interpreter.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/Logger.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/attrib_fromdict.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cache.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/gnu_libstdcpp.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/cpp/libcxx.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/metrics.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/formatters/synth.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/lldb-argdumper
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/crashlog.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap/Makefile
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/macosx/heap/heap_find.cpp
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/runtime/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/utils/__init__.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/lldb/utils/symbolication.py
+${PLIST.darwin}lib/rustlib/${RUST_ARCH}/lib/python2.7/site-packages/six.py
 man/man1/cargo-bench.1
 man/man1/cargo-build.1
 man/man1/cargo-check.1


Home | Main Index | Thread Index | Old Index