Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Anton Brondz (253915a56922adb00163b022d6bdcae139bb63a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Anton Brondz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Anton Brondz (253915a56922adb00163b022d6bdcae139bb63a2)
  • Date: Fri, 13 Oct 2006 10:03:44 -0500

GIT changes to master grimoire by Anton Brondz <dinolinux AT sourcemage.org>:

devel/lush/BUILD | 2 -
devel/lush/DEPENDS | 5 ++-
devel/lush/DETAILS | 7 ++---
devel/lush/HISTORY | 6 ++++
devel/lush/dldbfd.c.patch | 62
++++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 76 insertions(+), 6 deletions(-)

New commits:
commit 253915a56922adb00163b022d6bdcae139bb63a2
Author: Anton Brondz <dinolinux AT sourcemage.org>
Commit: Anton Brondz <dinolinux AT sourcemage.org>

lush: updated to 1.2

diff --git a/devel/lush/BUILD b/devel/lush/BUILD
index cbd9c68..f9953c1 100755
--- a/devel/lush/BUILD
+++ b/devel/lush/BUILD
@@ -1,2 +1,2 @@
-OPTS="--with-x $OPTS" &&
+patch -p1 < $SCRIPT_DIRECTORY/dldbfd.c.patch &&
default_build
diff --git a/devel/lush/DEPENDS b/devel/lush/DEPENDS
index 8979a03..2f61634 100755
--- a/devel/lush/DEPENDS
+++ b/devel/lush/DEPENDS
@@ -1 +1,4 @@
-depends X11-LIBS
+optional_depends X11-LIBS \
+ "--with-x" \
+ "--without-x" \
+ "for a graphical interface"
diff --git a/devel/lush/DETAILS b/devel/lush/DETAILS
index 9a9b3b3..6d83eac 100755
--- a/devel/lush/DETAILS
+++ b/devel/lush/DETAILS
@@ -1,11 +1,10 @@
SPELL=lush
- VERSION=1.1
+ VERSION=1.2
SOURCE=${SPELL}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=${SOURCEFORGE_URL}/lush/${SOURCE}
-
SOURCE_HASH=sha512:d509a19cadd1e51de9c163b08a1b2dc8f579776ccd75519d94fcf6fbf53060d46b286f3f53158bdee22052f744e75d150dab080cd20e01f14acb9ebb0a7b2c2a
- WEB_SITE="http://lush.sourceforge.net/";
- GCC_VERSION=3.4
+
SOURCE_HASH=sha512:16705b3654d40855b40f6d14b0a7d87a2405bac602cf1d4d8a6c436d75147ad37850a11801ff2afdcc7f479c6e408e86c6b0561a1bd7bd5a17b005d0177acf91
+ WEB_SITE=http://lush.sourceforge.net/
LICENSE[0]=GPL
ENTERED=20050710
KEYWORDS="devel"
diff --git a/devel/lush/HISTORY b/devel/lush/HISTORY
index 54f2b81..3a26757 100644
--- a/devel/lush/HISTORY
+++ b/devel/lush/HISTORY
@@ -1,3 +1,9 @@
+2006-10-13 Anton Brondz <dinolinux AT sourcemage.org>
+ * DETAILS: updated to 1.2, removed GCC_VERSION
+ * dldbfd.c.patch: added, needed to fix a bug in dldbfd
+ * BUILD: changed to use the patch
+ * DEPENDS: made X optional
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/devel/lush/dldbfd.c.patch b/devel/lush/dldbfd.c.patch
new file mode 100644
index 0000000..d89089b
--- /dev/null
+++ b/devel/lush/dldbfd.c.patch
@@ -0,0 +1,62 @@
+--- lush-1.2_old/src/dldbfd.c 2006-10-13 16:32:21.000000000 +0200
++++ lush-1.2/src/dldbfd.c 2006-10-13 16:34:35.000000000 +0200
+@@ -24,7 +24,7 @@
+ ***********************************************************************/
+
+ /***********************************************************************
+- * $Id: dldbfd.c,v 1.50 2005/08/11 17:47:36 leonb Exp $
++ * $Id: dldbfd.c,v 1.52 2006/09/05 22:12:43 leonb Exp $
+ **********************************************************************/
+
+ #ifdef HAVE_CONFIG_H
+@@ -94,6 +94,13 @@
+ # define dldbfd_section_size(p) ((p)->size)
+ #endif
+
++#if HAVE_BFD_HASH_TABLE_INIT_WANTS_2_ARGS
++# define my_bfd_hash_table_init(a,b,c) bfd_hash_table_init(a,b)
++#else
++# define my_bfd_hash_table_init(a,b,c) bfd_hash_table_init(a,b,c)
++#endif
++
++
+ void *bfd_alloc(bfd *abfd, bfd_size_type wanted);
+ unsigned int bfd_log2 (bfd_vma x);
+
+@@ -683,7 +690,7 @@ init_global_symbol_table(void)
+ {
+ static int initialized = 0;
+ ASSERT(!initialized);
+- bfd_hash_table_init(&global_symbol_table, init_symbol_entry);
++ my_bfd_hash_table_init(&global_symbol_table, init_symbol_entry,
sizeof(symbol_entry));
+ initialized = 1;
+ }
+
+@@ -1129,7 +1136,7 @@ mipself_init_got_info(module_entry *ent,
+ /* Create GOT hash table */
+ info->sgot = NULL;
+ info->gotsize = 0;
+- bfd_hash_table_init(&info->got_table, mipself_init_got_entry);
++ my_bfd_hash_table_init(&info->got_table, mipself_init_got_entry,
sizeof(mipself_got_entry));
+ /* Identify pertinent howto information */
+ info->reloc_got16 = bfd_reloc_type_lookup(ent->abfd,BFD_RELOC_MIPS_GOT16);
+ info->reloc_call16 =
bfd_reloc_type_lookup(ent->abfd,BFD_RELOC_MIPS_CALL16);
+@@ -1511,7 +1518,7 @@ alphaelf_init_got_info(module_entry *ent
+ {
+ info->sgot = NULL;
+ info->gotsize = 0;
+- bfd_hash_table_init(&info->got_table, alphaelf_init_got_entry);
++ my_bfd_hash_table_init(&info->got_table, alphaelf_init_got_entry,
sizeof(alphaelf_got_entry));
+ info->reloc_literal =
bfd_reloc_type_lookup(ent->abfd,BFD_RELOC_ALPHA_ELF_LITERAL);
+ info->reloc_64 = bfd_reloc_type_lookup(ent->abfd,BFD_RELOC_64);
+ }
+@@ -2722,7 +2729,7 @@ link_archive_members(module_entry *modul
+ chain_of_bfd *chain;
+
+ /* Initialize archive symbol table */
+- if (! bfd_hash_table_init(&archive_map, init_archive_entry))
++ if (! my_bfd_hash_table_init(&archive_map, init_archive_entry,
sizeof(archive_entry)))
+ THROW(bfd_errmsg(bfd_error_no_memory));
+ cookie.armap = &archive_map;
+ cookie.armod = module;
+



  • [SM-Commit] GIT changes to master grimoire by Anton Brondz (253915a56922adb00163b022d6bdcae139bb63a2), Anton Brondz, 10/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page