• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqt誰得cocoawindowspythonrubyphpgameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdombtronvb.netdirectxarduinopreviewerゲームエンジン

Experimental package creation tool for MinGW.org


Commit MetaInfo

修訂62159e13ca41b691b8a09c027af242308d0632b3 (tree)
時間2022-03-09 23:43:21
作者Keith Marshall <keith@user...>
CommiterKeith Marshall

Log Message

Honour "--identity" option for specification file name.

* src/modules/pkgspec.sh (pkgspec_from_srcdir): Prioritize over...
[-n PACKAGE_ABS_SRCDIR] (PACKAGE_ABS_SRCDIR): ...this, preferred to...
[-z PACKAGE_ABS_SRCDIR] (PACKAGE_SRCDIR): ...this; do NOT use this by
default, because it doesn't yield a valid specification file name, in
the common case where its basename is "..", or ".".

Change Summary

差異

--- a/src/modules/pkgspec.sh
+++ b/src/modules/pkgspec.sh
@@ -60,11 +60,13 @@
6060 # a suitable default from the name of the top-level source code directory.
6161 #
6262 pkgspec_from_srcdir() {
63- pkgspec_request_class=pkgspec_$1
63+ local pkgspec_request_class=pkgspec_$1
6464 #
6565 # An optional second argument overrides the default derivation.
6666 #
67- IFS=-; set -- ${2-`basename "$PACKAGE_SRCDIR"`}; IFS=
67+ local default_srcdir="$PACKAGE_ABS_SRCDIR"
68+ test -n "$default_srcdir" || default_srcdir="$PACKAGE_SRCDIR"
69+ IFS=-; set -- ${2-${PORTSPEC-`basename "$default_srcdir"`}}; IFS=
6870 value= fs=; $pkgspec_request_class "$@"
6971 }
7072 pkgspec_get_name() {