Skip to Content.
Sympa Menu

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

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 (964a62e742b8587abf44c8aa28420d660de9c1d5)
  • Date: Tue, 6 Feb 2007 13:27:53 -0600

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

ChangeLog | 4 +
devel/autoconf-2.13/BUILD | 4 +
devel/autoconf-2.13/DEPENDS | 4 +
devel/autoconf-2.13/DETAILS | 23 ++++++++++
devel/autoconf-2.13/HISTORY | 64 ++++++++++++++++++++++++++++
devel/autoconf-2.13/PRE_BUILD | 3 +
devel/autoconf-2.13/TRIGGERS | 1
devel/autoconf-2.13/versioned.patch | 11 ++++
http/firefox/DEPENDS | 4 +
http/firefox/HISTORY | 5 ++
http/firefox/PRE_BUILD | 8 +++
http/firefox/visibility.patch | 81
++++++++++++++++++++++++++++++++++++
12 files changed, 212 insertions(+)

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

firefox

oops wrong patch strip value

commit 9f0c3c783be03dc62f78446cb10696af8932a5a6
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

firefox

Added a visibility patch to fix the build issue amd64 users have with
firefox 2.0.0.1

commit 722f6f9afdfa59d81f50fccade277a045db23a88
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

autoconf-2.13

Added a new spell to be able to regenerate mozilla's ./configure
Their macro file really sucks and doesn't work with any autconf beyond
2.13

diff --git a/ChangeLog b/ChangeLog
index 563ad3f..c2b5d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-06 David Kowis <dkowis AT shlrm.org>
+ * devel/autoconf-2.13: NEW SPELL Needed to regenerate firefox'
+ configure script for amd64 users
+
2007-02-05 Juuso Alasuutari <iuso AT sourcemage.org>
* windowmanagers/ion: Deprecated (renamed to ion3).
* windowmanagers/ion3: Added, was ion.
diff --git a/devel/autoconf-2.13/BUILD b/devel/autoconf-2.13/BUILD
new file mode 100755
index 0000000..6f6800b
--- /dev/null
+++ b/devel/autoconf-2.13/BUILD
@@ -0,0 +1,4 @@
+make_single &&
+OPTS="${OPTS} --program-suffix=-2.13" &&
+default_build &&
+make_normal
diff --git a/devel/autoconf-2.13/DEPENDS b/devel/autoconf-2.13/DEPENDS
new file mode 100755
index 0000000..93784ca
--- /dev/null
+++ b/devel/autoconf-2.13/DEPENDS
@@ -0,0 +1,4 @@
+depends gnupg &&
+depends m4 &&
+depends perl &&
+depends smgl-fhs
diff --git a/devel/autoconf-2.13/DETAILS b/devel/autoconf-2.13/DETAILS
new file mode 100755
index 0000000..ce95eee
--- /dev/null
+++ b/devel/autoconf-2.13/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=autoconf-2.13
+ VERSION=2.13
+ SOURCE=autoconf-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/autoconf-$VERSION
+ SOURCE_URL[0]=$GNU_URL/autoconf/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/autoconf/$SOURCE
+
SOURCE_HASH=sha512:602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad
+ WEB_SITE=http://www.gnu.org/software/autoconf
+ ENTERED=20070206
+ LICENSE[0]=GPL
+ KEYWORDS="devel"
+ SHORT="autoconf produces shell scripts which automatically
configure source code."
+cat << EOF
+autoconf - Produces shell scripts which automatically configure source
+code
+Extensible package of m4 macros that produce shell scripts to
+automatically configure software source code packages. These scripts can
+adapt the packages to many kinds of UNIX-like systems without manual
+user intervention. Autoconf requires GNU m4. You must install GNU m4
+before configuring autoconf, so that Autoconf's configure script can
+find it. The configuration scripts produced by auto conf are
+self-contained, so their users do not need to have autoconf or GNU m4.
+EOF
diff --git a/devel/autoconf-2.13/HISTORY b/devel/autoconf-2.13/HISTORY
new file mode 100644
index 0000000..810eeb5
--- /dev/null
+++ b/devel/autoconf-2.13/HISTORY
@@ -0,0 +1,64 @@
+2007-02-06 David Kowis <dkowis AT shlrm.org>
+ * ALL: thiefed from autoconf
+ * BUILD: changed the build process to include versioned
+ * versioned.patch: the patch to the makefile to make things install
in
+ the correct space
+
+2006-12-11 Anton Brondz <dinolinux AT sourcemage.org>
+ * BUILD: added make_single and make_normal
+
+2006-11-18 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: 2.61
+
+2006-06-27 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.60, vendor gpg checking (B5C4CE13)
+
+2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
+ * DETAILS: (automated) Add KEYWORDS
+
+2006-02-08 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depends on smgl-fhs (for directory structure)
+
+2006-02-06 Eric Sandall <eric AT sandall.us>
+ * DEPENDS: Depends on gnupg (for SOURCE verification)
+
+2005-11-29 Seth Woolley <seth AT tautology.org>
+ * DETAILS: MD5 -> SHA512
+
+2004-05-12 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated UPDATED to register trigger
+ * TRIGGERS: Add cast_self on perl cast (Bug #6844)
+
+2004-02-01 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: remove archive=off
+
+2004-01-22 hgg <hgreig AT bigpond.net.au>
+ * DEPENDS: add perl
+
+2003-12-16 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.59
+
+2003-11-05 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 2.58
+ * HISTORY: Formatted to Guru Handbook
+
+2003-06-23 hgg <hgreig AT bigpond.net.au>
+ * DETAILS: ARCHIVE="off" fix in bugzilla bug #1068, reverting
+ change 13315, keeping 13321
+ * PREPARE: Added to remove cache after fixing bug #1068
+
+2002-12-06 Julian v. Bock <julian AT wongr.net>
+ * DETAILS: set VERSION to 2.57.
+
+2002-11-16 Julian v. Bock <julian AT wongr.net>
+ * DETAILS: set VERSION to 2.56.
+
+2002-10-03 Julian v. Bock <julian AT wongr.net>
+ * DETAILS: add LICENSE and MD5 fields.
+
+2002-09-17 Julian v. Bock <julian AT wongr.net>
+ * DETAILS: set VERSION to 2.54.
+
+2002-05-21 Julian v. Bock <julian AT wongr.net>
+ * DETAILS: set VERSION to 2.53.
+
diff --git a/devel/autoconf-2.13/PRE_BUILD b/devel/autoconf-2.13/PRE_BUILD
new file mode 100755
index 0000000..9de67a5
--- /dev/null
+++ b/devel/autoconf-2.13/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SCRIPT_DIRECTORY/versioned.patch
diff --git a/devel/autoconf-2.13/TRIGGERS b/devel/autoconf-2.13/TRIGGERS
new file mode 100755
index 0000000..4bf3b34
--- /dev/null
+++ b/devel/autoconf-2.13/TRIGGERS
@@ -0,0 +1 @@
+on_cast perl cast_self
diff --git a/devel/autoconf-2.13/versioned.patch
b/devel/autoconf-2.13/versioned.patch
new file mode 100644
index 0000000..c451a90
--- /dev/null
+++ b/devel/autoconf-2.13/versioned.patch
@@ -0,0 +1,11 @@
+--- orig.Makefile.in 2007-02-06 12:11:44.000000000 +0000
++++ Makefile.in 2007-02-06 12:16:01.000000000 +0000
+@@ -49,7 +49,7 @@
+
+ # Directory in which to install library files.
+ datadir = @datadir@
+-acdatadir = $(datadir)/autoconf
++acdatadir = $(datadir)/autoconf-2.13
+
+ # Directory in which to install documentation info files.
+ infodir = @infodir@
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 429983f..bc9734b 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -9,6 +9,10 @@ depends perl &
depends zip &&
depends zlib '--with-system-zlib' &&
depends nss &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ #need this bad boy to rebuild the ./configure so it works
+ depends autoconf-2.13
+fi &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar' &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 31c0e80..ef2d46b 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2007-02-06 David Kowis <dkowis AT shlrm.org>
+ * visibility.patch: solution to exploding firefox build on amd64
+ * PRE_BUILD: added application of patch and regen of ./configure
+ * DEPENDS: added dependency for autoconf-2.13 if amd64
+
2007-01-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 2.0.0.1
* PREPARE: Removed choice for gtk. Only could test with gtk+2
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 042d15f..ee7543c 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -33,4 +33,12 @@ fi &&
cp $SCRIPT_DIRECTORY/mozconfig $SOURCE_DIRECTORY/.mozconfig &&
if [ "$FIREFOX_OFFICIAL" == "y" ]; then
sedit '24iac_add_options --enable-official-branding'
$SOURCE_DIRECTORY/.mozconfig
+fi &&
+
+# apply visibility fix patch for amd64.
+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/http/firefox/visibility.patch b/http/firefox/visibility.patch
new file mode 100644
index 0000000..f157772
--- /dev/null
+++ b/http/firefox/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 (964a62e742b8587abf44c8aa28420d660de9c1d5), David Kowis, 02/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page