stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6998016: Incorrect ifdef nesting in sane-gcc-compiler rule

Browse Source 
6998014: Use /etc/lsb-release, when available, to detect linux variant and version

Reviewed-by: dholmes, ohair
This commit is contained in:
Mike Duigou 2010-11-29 10:37:44 -08:00
parent b6b4b5086c
commit 7da94e3872
2 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/common/shared/Defs-linux.gmk
View File

@ -123,7 +123,7 @@ LIBM=-lm
# GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed # GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
# NOTE: Must end with / so that it could be empty, allowing PATH usage. # NOTE: Must end with / so that it could be empty, allowing PATH usage.
ifneq "$(origin ALT_GCC29_COMPILER_PATH)" "undefined" ifdef ALT_GCC29_COMPILER_PATH
GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH)) GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH))
else else
GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/ GCC29_COMPILER_PATH = $(JDK_DEVTOOLS_DIR)/$(PLATFORM)/gcc29/usr/

25
jdk/make/common/shared/Sanity.gmk
View File

@ -99,12 +99,16 @@ ifeq ($(PLATFORM), linux)
echo "RedHat"; \ echo "RedHat"; \
elif [ -f /etc/SuSE-release ] ; then \ elif [ -f /etc/SuSE-release ] ; then \
echo "SuSE"; \ echo "SuSE"; \
elif [ -f /etc/lsb-release ] ; then \
$(EGREP) DISTRIB_ID /etc/lsb-release | $(SED) -e 's@.*DISTRIB_ID=\(.*\)@\1@'; \
else \ else \
echo "Unknown"; \ echo "Unknown"; \
fi) fi)
OS_VARIANT_VERSION := $(shell \ OS_VARIANT_VERSION := $(shell \
if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \ if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
$(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \ $(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
elif [ -f /etc/lsb-release ] ; then \
$(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
fi) fi)
ALSA_INCLUDE=/usr/include/alsa/version.h ALSA_INCLUDE=/usr/include/alsa/version.h
ALSA_LIBRARY=/usr/lib/libasound.so ALSA_LIBRARY=/usr/lib/libasound.so
@ -279,7 +283,7 @@ sane-arch_data_model:
fi fi
###################################################### ######################################################
# Check the OS version (windows and linus have release name checks) # Check the OS version (windows and linux have release name checks)
# NOTE: OPENJDK explicitly does not check for OS release information. # NOTE: OPENJDK explicitly does not check for OS release information.
# Unless we know for sure that it will not build somewhere, we cannot # Unless we know for sure that it will not build somewhere, we cannot
# generate a fatal sanity error, and a warning about the official # generate a fatal sanity error, and a warning about the official
@ -1476,11 +1480,11 @@ ifeq ($(PLATFORM), windows)
endif endif
###################################################### ######################################################
# Check the Solaris GNU c++ compiler for solaris plugin # Check the GNU C++ compiler for OJI plugin
###################################################### ######################################################
sane-gcc-compiler: sane-gcc-compiler:
ifeq ($(PLATFORM), solaris) ifndef OPENJDK
ifndef OPENJDK ifeq ($(PLATFORM), solaris)
@if [ -r $(GCC_COMPILER_PATH) ]; then \ @if [ -r $(GCC_COMPILER_PATH) ]; then \
if [ ! "$(GCC_VER)" = $(REQUIRED_GCC_VERSION) ]; then \ if [ ! "$(GCC_VER)" = $(REQUIRED_GCC_VERSION) ]; then \
$(ECHO) "ERROR: The Solaris GCC compiler version must be $(REQUIRED_GCC_VERSION). \n" \ $(ECHO) "ERROR: The Solaris GCC compiler version must be $(REQUIRED_GCC_VERSION). \n" \
@ -1501,6 +1505,7 @@ ifeq ($(PLATFORM), solaris)
endif endif
ifeq ($(PLATFORM), linux) ifeq ($(PLATFORM), linux)
ifeq ($(ARCH_DATA_MODEL), 32)
ifdef ALT_GCC29_COMPILER_PATH ifdef ALT_GCC29_COMPILER_PATH
@if [ ! -x $(ALT_GCC29_COMPILER_PATH)/bin/gcc ]; then \ @if [ ! -x $(ALT_GCC29_COMPILER_PATH)/bin/gcc ]; then \
$(ECHO) "ERROR: You do not have a valid ALT_GCC29_COMPILER_PATH setting. \n" \ $(ECHO) "ERROR: You do not have a valid ALT_GCC29_COMPILER_PATH setting. \n" \
@ -1509,7 +1514,7 @@ ifeq ($(PLATFORM), solaris)
" This will affect you if you build the plugin target. \n" \ " This will affect you if you build the plugin target. \n" \
"" >> $(ERROR_FILE) ; \ "" >> $(ERROR_FILE) ; \
fi fi
endif else
ifdef ALT_GCC29_PLUGIN_LIB_PATH ifdef ALT_GCC29_PLUGIN_LIB_PATH
@if [ ! -r $(ALT_GCC29_PLUGIN_LIB_PATH)/libjavaplugin_oji.so ]; then \ @if [ ! -r $(ALT_GCC29_PLUGIN_LIB_PATH)/libjavaplugin_oji.so ]; then \
$(ECHO) "Error: You do not have a valid ALT_GCC29_PLUGIN_LIB_PATH setting. \n" \ $(ECHO) "Error: You do not have a valid ALT_GCC29_PLUGIN_LIB_PATH setting. \n" \
@ -1523,13 +1528,15 @@ ifeq ($(PLATFORM), solaris)
$(ECHO) "ERROR: You do not have a valid GCC29_COMPILER_PATH setting. \n" \ $(ECHO) "ERROR: You do not have a valid GCC29_COMPILER_PATH setting. \n" \
" Please check your access to \n" \ " Please check your access to \n" \
" $(GCC29_COMPILER_PATH) \n" \ " $(GCC29_COMPILER_PATH) \n" \
" and/or check your value of ALT_GCC29_COMPILER_PATH. \n" \ " and/or check your value of ALT_GCC29_COMPILER_PATH or ALT_GCC29_PLUGIN_LIB_PATH \n" \
" This will affect you if you build the plugin target. \n" \ " This will affect you if you build the plugin target. \n" \
"" >> $(ERROR_FILE) ; \ "" >> $(ERROR_FILE) ; \
fi fi
endif endif # ALT_GCC29_PLUGIN_LIB_PATH
endif endif # ALT_GCC29_COMPILER_PATH
endif endif # ARCH_DATA_MODEL, 32
endif # LINUX
endif # OPEN_JDK
###################################################### ######################################################