Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
ccb55e69
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ccb55e69
编写于
3月 27, 2015
作者:
E
erikj
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8076123: 9-dev build fail: make/Init.gmk:142: *** multiple target patterns. Stop.
Reviewed-by: ihse
上级
39aa8a3a
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
85 addition
and
5 deletion
+85
-5
common/autoconf/basics.m4
common/autoconf/basics.m4
+9
-0
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+59
-1
common/autoconf/spec.gmk.in
common/autoconf/spec.gmk.in
+3
-0
make/Init.gmk
make/Init.gmk
+1
-1
make/InitSupport.gmk
make/InitSupport.gmk
+11
-2
make/Main.gmk
make/Main.gmk
+2
-1
未找到文件。
common/autoconf/basics.m4
浏览文件 @
ccb55e69
...
...
@@ -459,12 +459,21 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
AC_MSG_RESULT([$TOPDIR])
AC_SUBST(TOPDIR)
# Save the original version of TOPDIR for string comparisons
ORIGINAL_TOPDIR="$TOPDIR"
AC_SUBST(ORIGINAL_TOPDIR)
# We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
BASIC_FIXUP_PATH(CURDIR)
BASIC_FIXUP_PATH(TOPDIR)
# SRC_ROOT is a traditional alias for TOPDIR.
SRC_ROOT=$TOPDIR
# Calculate a canonical version of TOPDIR for string comparisons
CANONICAL_TOPDIR=$TOPDIR
BASIC_REMOVE_SYMBOLIC_LINKS([CANONICAL_TOPDIR])
AC_SUBST(CANONICAL_TOPDIR)
# Locate the directory of this script.
AUTOCONF_DIR=$TOPDIR/common/autoconf
])
...
...
common/autoconf/generated-configure.sh
浏览文件 @
ccb55e69
...
...
@@ -907,6 +907,8 @@ JVM_VARIANTS
JVM_INTERPRETER
JDK_VARIANT
SET_OPENJDK
CANONICAL_TOPDIR
ORIGINAL_TOPDIR
TOPDIR
PATH_SEP
ZERO_ARCHDEF
...
...
@@ -4363,7 +4365,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1427
382753
DATE_WHEN_GENERATED=1427
461839
###############################################################################
#
...
...
@@ -14135,6 +14137,10 @@ $as_echo_n "checking for top-level directory... " >&6; }
$as_echo "$TOPDIR" >&6; }
# Save the original version of TOPDIR for string comparisons
ORIGINAL_TOPDIR="$TOPDIR"
# We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
# Only process if variable expands to non-empty
...
...
@@ -14391,6 +14397,58 @@ $as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid."
# SRC_ROOT is a traditional alias for TOPDIR.
SRC_ROOT=$TOPDIR
# Calculate a canonical version of TOPDIR for string comparisons
CANONICAL_TOPDIR=$TOPDIR
if test "x$OPENJDK_BUILD_OS" != xwindows; then
# Follow a chain of symbolic links. Use readlink
# where it exists, else fall back to horribly
# complicated shell code.
if test "x$READLINK_TESTED" != yes; then
# On MacOSX there is a readlink tool with a different
# purpose than the GNU readlink tool. Check the found readlink.
ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
if test "x$ISGNU" = x; then
# A readlink that we do not know how to use.
# Are there other non-GNU readlinks out there?
READLINK_TESTED=yes
READLINK=
fi
fi
if test "x$READLINK" != x; then
CANONICAL_TOPDIR=`$READLINK -f $CANONICAL_TOPDIR`
else
# Save the current directory for restoring afterwards
STARTDIR=$PWD
COUNTER=0
sym_link_dir=`$DIRNAME $CANONICAL_TOPDIR`
sym_link_file=`$BASENAME $CANONICAL_TOPDIR`
cd $sym_link_dir
# Use -P flag to resolve symlinks in directories.
cd `$THEPWDCMD -P`
sym_link_dir=`$THEPWDCMD -P`
# Resolve file symlinks
while test $COUNTER -lt 20; do
ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
if test "x$ISLINK" == x; then
# This is not a symbolic link! We are done!
break
fi
# Again resolve directory symlinks since the target of the just found
# link could be in a different directory
cd `$DIRNAME $ISLINK`
sym_link_dir=`$THEPWDCMD -P`
sym_link_file=`$BASENAME $ISLINK`
let COUNTER=COUNTER+1
done
cd $STARTDIR
CANONICAL_TOPDIR=$sym_link_dir/$sym_link_file
fi
fi
# Locate the directory of this script.
AUTOCONF_DIR=$TOPDIR/common/autoconf
common/autoconf/spec.gmk.in
浏览文件 @
ccb55e69
...
...
@@ -133,6 +133,9 @@ OVERRIDE_SRC_ROOT:=@OVERRIDE_SRC_ROOT@
# The top-level directory of the forest (SRC_ROOT is a traditional alias)
TOPDIR:=@TOPDIR@
# These two versions of TOPDIR are used in string comparisons
ORIGINAL_TOPDIR:=@ORIGINAL_TOPDIR@
CANONICAL_TOPDIR:=@CANONICAL_TOPDIR@
SRC_ROOT:=@TOPDIR@
OUTPUT_ROOT:=@OUTPUT_ROOT@
...
...
make/Init.gmk
浏览文件 @
ccb55e69
...
...
@@ -52,7 +52,7 @@ include $(topdir)/make/Help.gmk
# Extract main targets from Main.gmk.
ifneq ($(any_spec_file), )
ifeq ($(wildcard $(dir $(any_spec_file))/make-support),)
ifeq ($(wildcard $(dir $(any_spec_file))/make-support
/module-deps.gmk
),)
# If make-support does not exist, we need to build the genmodules java tool first.
$(info Creating data for first make execution in new configuration...)
ignore_output := $(shell $(MAKE) -r -R -f $(topdir)/make/Main.gmk \
...
...
make/InitSupport.gmk
浏览文件 @
ccb55e69
...
...
@@ -264,8 +264,17 @@ else # $(HAS_SPEC)=true
# Sanity check the spec file, so it matches this source code
define CheckSpecSanity
ifneq ($$(topdir), $$(TOPDIR))
$$(info Error: SPEC mismatch. $$$$(TOPDIR) does not match current directory.)
$$(error Cannot continue)
ifneq ($$(topdir), $$(ORIGINAL_TOPDIR))
ifneq ($$(topdir), $$(CANONICAL_TOPDIR))
$$(info Error: SPEC mismatch! Current working directory)
$$(info $$(topdir))
$$(info does not match either TOPDIR, ORIGINAL_TOPDIR or CANONICAL_TOPDIR)
$$(info $$(TOPDIR))
$$(info $$(ORIGINAL_TOPDIR))
$$(info $$(CANONICAL_TOPDIR))
$$(error Cannot continue)
endif
endif
endif
endef
...
...
make/Main.gmk
浏览文件 @
ccb55e69
...
...
@@ -220,7 +220,8 @@ $(SUPPORT_OUTPUTDIR)/source_tips: FRC
BOOTCYCLE_TARGET := product-images
bootcycle-images:
@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
+$(MAKE) $(MAKE_ARGS) -f Main.gmk SPEC=$(dir $(SPEC))bootcycle-spec.gmk $(BOOTCYCLE_TARGET)
+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Main.gmk \
SPEC=$(dir $(SPEC))bootcycle-spec.gmk $(BOOTCYCLE_TARGET)
zip-security:
+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录