Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (fdd202710b136b7ca045e474b007781a5866cce9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (fdd202710b136b7ca045e474b007781a5866cce9)
  • Date: Tue, 6 Feb 2007 14:29:12 -0600

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

mail/thunderbird/DEPENDS | 5 ++
mail/thunderbird/HISTORY | 5 ++
mail/thunderbird/PRE_BUILD | 10 ++++
mail/thunderbird/visibility.patch | 81
++++++++++++++++++++++++++++++++++++++
4 files changed, 101 insertions(+)

New commits:
commit fdd202710b136b7ca045e474b007781a5866cce9
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

thunderbird
Fixes the bug for amd64
Same exact patch as the firefox spell. Having a section for mozilla
spells would help
the code reuse thing.

diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 801f88f..b2ae98c 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -10,6 +10,11 @@ depends perl
depends zip
&&
depends gtk+2
\
'--enable-xft --disable-freetype2 --enable-default-toolkit=gtk2'
&&
+# copy/paste from firefox
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ #need this bad boy to rebuild the ./configure so it works
+ depends autoconf-2.13
+fi &&

#
# LDAP support doesn't work (fails to build)
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index 52e2985..ffe9c26 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,8 @@
+2007-02-06 David Kowis <dkowis AT shlrm.org>
+ * visibility.patch: Copied from the firefox spell
+ * PRE_BUILD: apply visibility patch, if amd64
+ * DEPENDS: needs autoconf-2.13 if amd64
+
2007-01-26 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.0b2

diff --git a/mail/thunderbird/PRE_BUILD b/mail/thunderbird/PRE_BUILD
index 770e954..ee31259 100755
--- a/mail/thunderbird/PRE_BUILD
+++ b/mail/thunderbird/PRE_BUILD
@@ -6,4 +6,14 @@ cp mail/config/mozconfig .mozconfig
if [ "$BUILD_ENIGMAIL" = "y" ]; then
cd $SOURCE_DIRECTORY/mailnews/extensions &&
unpack_file 3
+fi &&
+
+# apply visibility fix patch for amd64.
+# this is a copy/paste from firefox
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ cd $SOURCE_DIRECTORY &&
+ patch -p1 < $SCRIPT_DIRECTORY/visibility.patch &&
+ # regenerate the ./configure using the right version of autoconf
+ autoconf-2.13
fi
+
diff --git a/mail/thunderbird/visibility.patch
b/mail/thunderbird/visibility.patch
new file mode 100644
index 0000000..f157772
--- /dev/null
+++ b/mail/thunderbird/visibility.patch
@@ -0,0 +1,81 @@
+--- mozilla/configure.in- 2007-01-12 21:56:59.000000000 +0100
++++ mozilla/configure.in 2007-01-12 21:58:08.000000000 +0100
+@@ -2518,7 +2518,7 @@
+ EOF
+ ac_cv_visibility_hidden=no
+ if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
+- if grep '\.hidden.*foo' conftest.s >/dev/null; then
++ if egrep '\.(hidden|private_extern).*foo' conftest.s
>/dev/null; then
+ ac_cv_visibility_hidden=yes
+ fi
+ fi
+@@ -2534,7 +2534,7 @@
+ EOF
+ ac_cv_visibility_default=no
+ if ${CC-cc} -fvisibility=hidden -Werror -S conftest.c
-o conftest.s >/dev/null 2>&1; then
+- if ! grep '\.hidden.*foo' conftest.s >/dev/null; then
++ if ! egrep '\.(hidden|private_extern).*foo'
conftest.s >/dev/null; then
+ ac_cv_visibility_default=yes
+ fi
+ fi
+@@ -2553,8 +2553,8 @@
+ EOF
+ ac_cv_visibility_pragma=no
+ if ${CC-cc} -Werror -S conftest.c -o conftest.s
>/dev/null 2>&1; then
+- if grep '\.hidden.*foo_hidden' conftest.s
>/dev/null; then
+- if ! grep '\.hidden.*foo_default' conftest.s >
/dev/null; then
++ if egrep '\.(hidden|extern_private).*foo_hidden'
conftest.s >/dev/null; then
++ if ! egrep
'\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
+ ac_cv_visibility_pragma=yes
+ fi
+ fi
+@@ -2562,6 +2562,28 @@
+ rm -f conftest.[cs]
+ ])
+ if test "$ac_cv_visibility_pragma" = "yes"; then
++ AC_CACHE_CHECK(For gcc visibility bug with class-level attributes
(GCC bug 26905),
++ ac_cv_have_visibility_class_bug,
++ [cat > conftest.c <<EOF
++#pragma GCC visibility push(hidden)
++struct __attribute__ ((visibility ("default"))) TestStruct {
++ static void Init();
++};
++__attribute__ ((visibility ("default"))) void TestFunc() {
++ TestStruct::Init();
++}
++EOF
++ ac_cv_have_visibility_class_bug=no
++ if ! ${CXX-g++} ${CXXFLAGS} ${DSO_PIC_CFLAGS}
${DSO_LDOPTS} -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
++ ac_cv_have_visibility_class_bug=yes
++ else
++ if test `grep -c "@PLT" conftest.S` = 0; then
++ ac_cv_have_visibility_class_bug=yes
++ fi
++ fi
++ rm -rf conftest.{c,S}
++ ])
++
+ AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug
20297),
+ ac_cv_have_visibility_builtin_bug,
+ [cat > conftest.c <<EOF
+@@ -2576,12 +2598,17 @@
+ }
+ EOF
+ ac_cv_have_visibility_builtin_bug=no
+- if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o
conftest.so conftest.c >/dev/null 2>&1; then
++ if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS}
${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then
+ ac_cv_have_visibility_builtin_bug=yes
++ else
++ if test `grep -c "@PLT" conftest.S` = 0; then
++ ac_cv_visibility_builtin_bug=yes
++ fi
+ fi
+- rm -f conftest.{c,so}
++ rm -f conftest.{c,S}
+ ])
+- if test "$ac_cv_have_visibility_builtin_bug" = "no"; then
++ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \
++ "$ac_cv_have_visibility_class_bug" = "no"; then
+ VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include
$(topsrcdir)/config/gcc_hidden.h'
+ WRAP_SYSTEM_INCLUDES=1
+ else



  • [SM-Commit] GIT changes to master grimoire by David Kowis (fdd202710b136b7ca045e474b007781a5866cce9), David Kowis, 02/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page