Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2acf90423219c63f116ba87f252a6841dc51a665)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (2acf90423219c63f116ba87f252a6841dc51a665)
  • Date: Thu, 6 Jul 2006 09:58:23 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

gnu/gcj/BUILD | 5 +++++
gnu/gcj/DEPENDS | 8 ++++++--
gnu/gcj/DETAILS | 2 +-
gnu/gcj/HISTORY | 4 ++++
gnu/gcj/PREPARE | 1 +
5 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 2acf90423219c63f116ba87f252a6841dc51a665
Merge: 033c85f9bf0faafb5a4c1ca2a1f79bd7bbf6492f
0c408d5d6433b395b286f68418c9ed85d29213fb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Merge branch 'master' of ssh://florian AT scm.sourcemage.org/smgl/grimoire

commit 033c85f9bf0faafb5a4c1ca2a1f79bd7bbf6492f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

added optional support for AWT

diff --git a/gnu/gcj/BUILD b/gnu/gcj/BUILD
index 31e2af8..47642db 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -5,6 +5,11 @@ # get CFLAGS and LDFLAGS gcc was compile
persistent_read gcc GCC_CFLAGS CFLAGS &&
persistent_read gcc GCC_LDFLAGS LDFLAGS &&

+# when updating this spell please check if this is still necessary:
+if [ "$GCJ_AWT" = "y" ]; then
+ CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
+fi &&
+
sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&

cd $SOURCE_DIRECTORY.bld &&
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index 6aa97c6..869315c 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,5 +1,9 @@
-. $GRIMOIRE/libcompat &&
-depends gcc &&
+. $GRIMOIRE/libcompat &&
+depends gcc &&
+if [ "$GCJ_AWT" = "y" ]; then
+ depends gtk+2 '--enable-java-awt=gtk' &&
+ depends libart_lgpl
+fi &&
if [[ $VERSION != $(installed_version gcc) ]]; then
force_depends gcc
fi
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index f487a71..668426a 100755
--- a/gnu/gcj/DETAILS
+++ b/gnu/gcj/DETAILS
@@ -16,7 +16,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$V
LICENSE[0]=GPL
WEB_SITE=http://gcc.gnu.org/
ENTERED=20040705
- UPDATED=20041107
+ PATCHLEVEL=1
TMPFS=off
DOCS="$DOCS INSTALL"
SHORT="the GNU java compiler"
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 744650e..7003081 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,3 +1,7 @@
+2006-07-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, PREPARE, DEPENDS: added optional support for AWT
+ * DETAILS: remove UPDATED, added PATCHLEVEL
+
2006-03-12 David Brown <dmlb2000 AT gmail.com>
* DETAILS: fixed source hash for source3

diff --git a/gnu/gcj/PREPARE b/gnu/gcj/PREPARE
new file mode 100755
index 0000000..37959d6
--- /dev/null
+++ b/gnu/gcj/PREPARE
@@ -0,0 +1 @@
+config_query GCJ_AWT "Do you want support for AWT (requires gtk+2 and
libart_lgpl)?" n




Archive powered by MHonArc 2.6.24.

Top of Page