Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (14bbe6bfa129d84047ad762750e212d22d242159)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (14bbe6bfa129d84047ad762750e212d22d242159)
  • Date: Thu, 24 Nov 2011 08:24:11 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

gnu/gcc/BUILD | 2 +-
gnu/gcc/CONFIGURE | 3 ++-
gnu/gcc/HISTORY | 6 ++++++
gnu/gcc/PRE_SUB_DEPENDS | 15 ++++++++-------
gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS | 10 ----------
gnu/gcc/REPAIR^none^SUB_DEPENDS | 12 ------------
gnu/gcc/SUB_DEPENDS | 2 ++
7 files changed, 19 insertions(+), 31 deletions(-)

New commits:
commit 14bbe6bfa129d84047ad762750e212d22d242159
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

gcc: added JAVAHOME compile option as well as subdepends on it

diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 920604a..485d3bb 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -64,7 +64,7 @@ if list_find "$GCC_COMPILER" "ada" ; then

fi &&

-OPTS="--without-ppl --without-cloog $OPTS" &&
+OPTS="--without-ppl --without-cloog $GCJ_HOME $OPTS" &&

cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
diff --git a/gnu/gcc/CONFIGURE b/gnu/gcc/CONFIGURE
index 81b4a8d..44460f6 100755
--- a/gnu/gcc/CONFIGURE
+++ b/gnu/gcc/CONFIGURE
@@ -9,7 +9,8 @@ config_query_list GCC_TARGET "Select what build to use" \
profiledbootstrap-lean &&

if list_find "$GCC_COMPILER" "java" ; then
- config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and
libart_lgpl)?" n
+ config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and
libart_lgpl)?" n &&
+ config_query_option GCJ_HOME "Add JDK Tree emulation?" n
"--enable-java-home" ""
fi

#if list_find "$GCC_COMPILER" "ada"; then
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 1fce60a..7cd81c3 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,9 @@
+2011-11-24 Robin Cook <rcook AT wyrms.net>
+ * BUILD: added java home build option
+ * CONFIGURE: query about java home
+ * PRE_SUB_DEPENDS: added subdepends check on java home
+ * SUB_DEPENDS: added subdepends on java home
+
2011-11-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.6.2

diff --git a/gnu/gcc/PRE_SUB_DEPENDS b/gnu/gcc/PRE_SUB_DEPENDS
index 172005a..b16c25c 100755
--- a/gnu/gcc/PRE_SUB_DEPENDS
+++ b/gnu/gcc/PRE_SUB_DEPENDS
@@ -1,11 +1,12 @@
case $THIS_SUB_DEPENDS in
- CXX) list_find "$GCC_COMPILER" c++ ;;
- JAVA) list_find "$GCC_COMPILER" java ;;
- OBJC) list_find "$GCC_COMPILER" objc ;;
- FORTRAN) list_find "$GCC_COMPILER" fortran ;;
- GO) list_find "$GCC_COMPILER" go ;;
- ADA) list_find "$GCC_COMPILER" ada ;;
- ADDRLINE) [[ $GCC_ADA_LIBADDRLINE == "y" ]] ;;
+ CXX) list_find "$GCC_COMPILER" c++ ;;
+ JAVA) list_find "$GCC_COMPILER" java ;;
+ OBJC) list_find "$GCC_COMPILER" objc ;;
+ FORTRAN) list_find "$GCC_COMPILER" fortran ;;
+ GO) list_find "$GCC_COMPILER" go ;;
+ ADA) list_find "$GCC_COMPILER" ada ;;
+ ADDRLINE) [[ $GCC_ADA_LIBADDRLINE == "y" ]] ;;
+ JAVAHOME) [[ $GCJ_HOME == "--enable-java-home" ]] ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS
b/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS
deleted file mode 100755
index 36b6eef..0000000
--- a/gnu/gcc/REPAIR^none^PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CXX) list_find "$GCC_COMPILER" c++ ;;
- JAVA) list_find "$GCC_COMPILER" java ;;
- OBJC) list_find "$GCC_COMPILER" objc ;;
- FORTRAN) list_find "$GCC_COMPILER" fortran ;;
- ADA) list_find "$GCC_COMPILER" ada ;;
- ADDRLINE) [[ $GCC_ADA_LIBADDRLINE == "y" ]] ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/gnu/gcc/REPAIR^none^SUB_DEPENDS b/gnu/gcc/REPAIR^none^SUB_DEPENDS
deleted file mode 100755
index edd1f9e..0000000
--- a/gnu/gcc/REPAIR^none^SUB_DEPENDS
+++ /dev/null
@@ -1,12 +0,0 @@
-persistent_add GCC_COMPILER &&
-persistent_add GCC_ADA_LIBADDRLINE &&
-case $THIS_SUB_DEPENDS in
- CXX) list_add GCC_COMPILER c++ ;;
- JAVA) list_add GCC_COMPILER java ;;
- OBJC) list_add GCC_COMPILER objc ;;
- FORTRAN) list_add GCC_COMPILER fortran ;;
- ADA) list_add GCC_COMPILER ada ;;
- ADDRLINE) GCC_ADA_LIBADDRLINE=y ;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
- return 1;;
-esac
diff --git a/gnu/gcc/SUB_DEPENDS b/gnu/gcc/SUB_DEPENDS
index 6fda439..954b628 100755
--- a/gnu/gcc/SUB_DEPENDS
+++ b/gnu/gcc/SUB_DEPENDS
@@ -1,5 +1,6 @@
persistent_add GCC_COMPILER &&
persistent_add GCC_ADA_LIBADDRLINE &&
+persistent_add GCJ_HOME &&
case $THIS_SUB_DEPENDS in
CXX) list_add GCC_COMPILER c++ ;;
JAVA) list_add GCC_COMPILER java ;;
@@ -8,6 +9,7 @@ case $THIS_SUB_DEPENDS in
GO) list_add GCC_COMPILER go ;;
ADA) list_add GCC_COMPILER ada ;;
ADDRLINE) GCC_ADA_LIBADDRLINE=y ;;
+ JAVAHOME) GCJ_HOME="--enable-java-home" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (14bbe6bfa129d84047ad762750e212d22d242159), Robin Cook, 11/24/2011

Archive powered by MHonArc 2.6.24.

Top of Page