Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8
提交
5b420797
D
dragonwell8
项目概览
openanolis
/
dragonwell8
通知
5
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
5b420797
编写于
1月 22, 2013
作者:
D
dholmes
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
38ed058e
1fa0e1e1
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
19 addition
and
15 deletion
+19
-15
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+1
-1
common/makefiles/Jprt.gmk
common/makefiles/Jprt.gmk
+18
-14
未找到文件。
common/autoconf/generated-configure.sh
浏览文件 @
5b420797
...
@@ -3731,7 +3731,7 @@ fi
...
@@ -3731,7 +3731,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1358
74232
6
DATE_WHEN_GENERATED=1358
90103
6
###############################################################################
###############################################################################
#
#
common/makefiles/Jprt.gmk
浏览文件 @
5b420797
...
@@ -43,24 +43,20 @@ endef
...
@@ -43,24 +43,20 @@ endef
BUILD_DIR_ROOT:=$(root_dir)/build
BUILD_DIR_ROOT:=$(root_dir)/build
# Appears to be an open build
OPEN_BUILD := \
$(shell \
if [ -d $(root_dir)/jdk/src/closed \
-o -d $(root_dir)/jdk/make/closed \
-o -d $(root_dir)/jdk/test/closed \
-o -d $(root_dir)/hotspot/src/closed \
-o -d $(root_dir)/hotspot/make/closed \
-o -d $(root_dir)/hotspot/test/closed ] ; then \
echo "false"; \
else \
echo "true"; \
fi \
)
ifdef OPENJDK
ifdef OPENJDK
OPEN_BUILD=true
OPEN_BUILD=true
else
OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
$(wildcard $(root_dir)/jdk/make/closed), \
$(wildcard $(root_dir)/jdk/test/closed), \
$(wildcard $(root_dir)/hotspot/src/closed), \
$(wildcard $(root_dir)/hotspot/make/closed), \
$(wildcard $(root_dir)/hotspot/test/closed)), \
false,true)
endif
endif
HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
###########################################################################
###########################################################################
# To help in adoption of the new configure&&make build process, a bridge
# To help in adoption of the new configure&&make build process, a bridge
# build will use the old settings to run configure and do the build.
# build will use the old settings to run configure and do the build.
...
@@ -103,6 +99,11 @@ endif
...
@@ -103,6 +99,11 @@ endif
ifdef ALT_FREETYPE_HEADERS_PATH
ifdef ALT_FREETYPE_HEADERS_PATH
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
endif
endif
ifeq ($(HOTSPOT_AVAILABLE),false)
ifdef ALT_JDK_IMPORT_PATH
@$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
endif
endif
ifeq ($(OPEN_BUILD),true)
ifeq ($(OPEN_BUILD),true)
@$(ECHO) " --enable-openjdk-only " >> $@.tmp
@$(ECHO) " --enable-openjdk-only " >> $@.tmp
else
else
...
@@ -128,6 +129,9 @@ else
...
@@ -128,6 +129,9 @@ else
ifdef ALT_SLASH_JAVA
ifdef ALT_SLASH_JAVA
@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
endif
endif
ifdef ALT_SPARKLE_FRAMEWORK_DIR
@$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
endif
endif
endif
@if [ -f $@ ] ; then \
@if [ -f $@ ] ; then \
if ! $(CMP) $@ $@.tmp > /dev/null ; then \
if ! $(CMP) $@ $@.tmp > /dev/null ; then \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录