packages: instantbird/instantbird.spec, instantbird/mozilla-ac.patch, insta...
glen
glen at pld-linux.org
Mon Aug 17 16:21:13 CEST 2009
Author: glen Date: Mon Aug 17 14:21:13 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- save work
---- Files affected:
packages/instantbird:
instantbird.spec (1.1 -> 1.2) , mozilla-ac.patch (1.7 -> 1.8) , nocross.patch (NONE -> 1.1) (NEW), syslibs.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/instantbird/instantbird.spec
diff -u packages/instantbird/instantbird.spec:1.1 packages/instantbird/instantbird.spec:1.2
--- packages/instantbird/instantbird.spec:1.1 Tue Jul 28 22:39:36 2009
+++ packages/instantbird/instantbird.spec Mon Aug 17 16:21:07 2009
@@ -7,9 +7,14 @@
Group: Applications/Networking
URL: http://www.instantbird.com/
Source0: http://www.instantbird.com/downloads/%{version}/%{name}-%{version}.src.tar.bz2
+Patch0: mozilla-ac.patch
+Patch1: syslibs.patch
+Patch2: nocross.patch
# Source0-md5: d9f9a93326d97de14b79d4d0fac09d29
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define specflags -fno-strict-aliasing
+
%description
Instantbird is a multi-protocol Instant Messaging client. Using it,
you can connect to all your different IM accounts.
@@ -19,11 +24,67 @@
%prep
%setup -q -n %{name}-%{version}-src
+%patch0 -p0
+%patch2 -p0
+%patch1 -p0
%build
cd mozilla
+cp -f %{_datadir}/automake/config.* build/autoconf
+%{__aclocal} -I build/autoconf
+%{__autoconf}
+
+cat << 'EOF' > .mozconfig
+. $topsrcdir/xulrunner/config/mozconfig
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=%{_prefix}
+ac_add_options --exec-prefix=%{_exec_prefix}
+ac_add_options --bindir=%{_bindir}
+ac_add_options --sbindir=%{_sbindir}
+ac_add_options --sysconfdir=%{_sysconfdir}
+ac_add_options --datadir=%{_datadir}
+ac_add_options --includedir=%{_includedir}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --libexecdir=%{_libexecdir}
+ac_add_options --localstatedir=%{_localstatedir}
+ac_add_options --sharedstatedir=%{_sharedstatedir}
+ac_add_options --mandir=%{_mandir}
+ac_add_options --infodir=%{_infodir}
+%if %{?debug:1}0
+ac_add_options --disable-optimize
+ac_add_options --enable-debug
+ac_add_options --enable-debug-modules
+ac_add_options --enable-debugger-info-modules
+ac_add_options --enable-crash-on-assert
+%else
+ac_add_options --disable-debug
+ac_add_options --disable-logging
+ac_add_options --enable-optimize="%{rpmcflags}"
+%endif
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
+%if %{with tests}
+ac_add_options --enable-tests
+%else
+ac_add_options --disable-tests
+%endif
+
+ac_add_options --with-distribution-id=org.pld-linux
+ac_add_options --with-system-bz2
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-png
+ac_add_options --with-system-zlib
+ac_add_options --with-default-mozilla-five-home=%{_libdir}/%{name}
+
+ac_add_options --enable-option-checking=fatal
+EOF
+
%{__make} -j1 -f client.mk build \
+ AUTOCONF=autoconf \
STRIP="/bin/true" \
CC="%{__cc}" \
CXX="%{__cxx}"
@@ -43,5 +104,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2009/08/17 14:21:07 glen
+- save work
+
Revision 1.1 2009/07/28 20:39:36 glen
- new, needs hacking this mozilla based build system
================================================================
Index: packages/instantbird/mozilla-ac.patch
diff -u packages/instantbird/mozilla-ac.patch:1.7 packages/instantbird/mozilla-ac.patch:1.8
--- packages/instantbird/mozilla-ac.patch:1.7 Wed Jul 29 01:00:43 2009
+++ packages/instantbird/mozilla-ac.patch Mon Aug 17 16:21:07 2009
@@ -1,5 +1,5 @@
---- mozilla/configure.in~ 2009-03-26 22:42:26.000000000 +0200
-+++ mozilla/configure.in 2009-07-29 01:44:16.749993376 +0300
+--- mozilla/configure.in 2009-07-29 02:01:16.830297512 +0300
++++ mozilla/configure.in 2009-07-30 02:29:31.194612978 +0300
@@ -62,6 +62,9 @@
AC_PREREQ(2.13)
@@ -250,7 +250,24 @@
fi
dnl Check for .hidden assembler directive and visibility attribute.
-@@ -2951,11 +2953,11 @@
+@@ -2911,10 +2913,12 @@
+ ;;
+ *)
+ AC_CHECK_LIB(m, atan)
+- AC_CHECK_LIB(dl, dlopen,
+- AC_CHECK_HEADER(dlfcn.h,
+- LIBS="-ldl $LIBS"
+- AC_DEFINE(HAVE_LIBDL)))
++ AC_CHECK_LIB(dl, dlopen, [
++ AC_CHECK_HEADER(dlfcn.h, [
++ LIBS="-ldl $LIBS"
++ AC_DEFINE(HAVE_LIBDL)
++ ])
++ ])
+ ;;
+ esac
+
+@@ -2951,11 +2955,11 @@
dnl Check whether the compiler supports the new-style C++ standard
dnl library headers (i.e. <new>) or needs the old "new.h"
@@ -264,7 +281,7 @@
AC_ARG_ENABLE(dtrace,
[ --enable-dtrace build with dtrace support if available (default=no)],
-@@ -3338,8 +3340,7 @@
+@@ -3338,8 +3342,7 @@
dnl check for wcrtomb/mbrtowc
dnl =======================================================================
if test -z "$MACOS_DEPLOYMENT_TARGET" || test "$MACOS_DEPLOYMENT_TARGET" -ge "100300"; then
@@ -274,7 +291,7 @@
AC_CACHE_CHECK(for wcrtomb,
ac_cv_have_wcrtomb,
[AC_TRY_LINK([#include <wchar.h>],
-@@ -3358,7 +3359,7 @@
+@@ -3358,7 +3361,7 @@
if test "$ac_cv_have_mbrtowc" = "yes"; then
AC_DEFINE(HAVE_MBRTOWC)
fi
@@ -283,7 +300,7 @@
fi
AC_CACHE_CHECK(
-@@ -3383,7 +3384,7 @@
+@@ -3383,7 +3386,7 @@
dnl AC_CHECK_LIB(resolv, res_ninit, AC_DEFINE(HAVE_RES_NINIT)))
fi
@@ -292,7 +309,7 @@
AC_CACHE_CHECK(
[for gnu_get_libc_version()],
ac_cv_func_gnu_get_libc_version,
-@@ -3461,7 +3462,7 @@
+@@ -3461,7 +3464,7 @@
AM_LANGINFO_CODESET
@@ -301,7 +318,7 @@
dnl **********************
dnl *** va_copy checks ***
-@@ -3624,7 +3625,7 @@
+@@ -3624,7 +3627,7 @@
dnl ========================================================
dnl Put your C++ language/feature checks below
dnl ========================================================
@@ -310,7 +327,7 @@
HAVE_GCC3_ABI=
if test "$GNU_CC"; then
-@@ -3939,7 +3940,7 @@
+@@ -3939,7 +3942,7 @@
dnl End of C++ language/feature checks
@@ -319,7 +336,7 @@
dnl ========================================================
dnl = Internationalization checks
-@@ -6561,10 +6562,9 @@
+@@ -6561,10 +6564,9 @@
MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS= )
if test "$COMPILE_ENVIRONMENT"; then
if test "$MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS"; then
@@ -332,7 +349,7 @@
AC_DEFINE(MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS)
fi
fi # COMPILE_ENVIRONMENT
-@@ -6681,10 +6681,9 @@
+@@ -6681,10 +6683,9 @@
dnl = Support for demangling undefined symbols
dnl ========================================================
if test -z "$SKIP_LIBRARY_CHECKS"; then
@@ -345,7 +362,7 @@
fi
# Demangle only for debug or trace-malloc builds
-@@ -6919,7 +6918,7 @@
+@@ -6919,7 +6920,7 @@
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
@@ -354,7 +371,7 @@
dnl ========================================================
dnl Test for -pedantic bustage
-@@ -7060,7 +7059,7 @@
+@@ -7060,7 +7061,7 @@
else
AC_DEFINE(CPP_THROW_NEW, [throw()])
fi
@@ -363,7 +380,7 @@
dnl ========================================================
dnl =
-@@ -8307,7 +8306,7 @@
+@@ -8307,7 +8308,7 @@
if test -n "$USE_ARM_KUSER"; then
ac_configure_args="$ac_configure_args --with-arm-kuser"
fi
@@ -372,6 +389,15 @@
ac_configure_args="$_SUBDIR_CONFIG_ARGS"
fi
+@@ -8338,7 +8339,7 @@
+ if test "$MOZ_MEMORY"; then
+ ac_configure_args="$ac_configure_args --enable-jemalloc"
+ fi
+-AC_OUTPUT_SUBDIRS(js/src)
++AC_CONFIG_SUBDIRS(js/src)
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+
+ fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
--- mozilla/build/autoconf/altoptions.m4~ 2009-03-26 22:38:57.000000000 +0200
+++ mozilla/build/autoconf/altoptions.m4 2009-07-29 01:34:11.680668351 +0300
@@ -146,9 +146,10 @@
================================================================
Index: packages/instantbird/nocross.patch
diff -u /dev/null packages/instantbird/nocross.patch:1.1
--- /dev/null Mon Aug 17 16:21:13 2009
+++ packages/instantbird/nocross.patch Mon Aug 17 16:21:07 2009
@@ -0,0 +1,103 @@
+--- mozilla/configure.in~ 2009-07-29 22:40:48.000000000 +0300
++++ mozilla/configure.in 2009-07-29 22:41:17.255773820 +0300
+@@ -250,98 +250,8 @@
+ esac
+
+ if test -n "$CROSS_COMPILE" && test "$target" != "$host"; then
+- echo "cross compiling from $host to $target"
+- cross_compiling=yes
+-
+- _SAVE_CC="$CC"
+- _SAVE_CFLAGS="$CFLAGS"
+- _SAVE_LDFLAGS="$LDFLAGS"
+-
+- AC_MSG_CHECKING([for host c compiler])
+- AC_CHECK_PROGS(HOST_CC, $HOST_CC gcc cc /usr/ucb/cc cl icc, "")
+- if test -z "$HOST_CC"; then
+- AC_MSG_ERROR([no acceptable c compiler found in \$PATH])
+- fi
+- AC_MSG_RESULT([$HOST_CC])
+- AC_MSG_CHECKING([for host c++ compiler])
+- AC_CHECK_PROGS(HOST_CXX, $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc, "")
+- if test -z "$HOST_CXX"; then
+- AC_MSG_ERROR([no acceptable c++ compiler found in \$PATH])
+- fi
+- AC_MSG_RESULT([$HOST_CXX])
+-
+- if test -z "$HOST_CFLAGS"; then
+- HOST_CFLAGS="$CFLAGS"
+- fi
+- if test -z "$HOST_CXXFLAGS"; then
+- HOST_CXXFLAGS="$CXXFLAGS"
+- fi
+- if test -z "$HOST_LDFLAGS"; then
+- HOST_LDFLAGS="$LDFLAGS"
+- fi
+- AC_CHECK_PROGS(HOST_RANLIB, $HOST_RANLIB ranlib, ranlib, :)
+- AC_CHECK_PROGS(HOST_AR, $HOST_AR ar, ar, :)
+- CC="$HOST_CC"
+- CFLAGS="$HOST_CFLAGS"
+- LDFLAGS="$HOST_LDFLAGS"
+-
+- AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
+- AC_TRY_COMPILE([], [return(0);],
+- [ac_cv_prog_hostcc_works=1
+- AC_MSG_RESULT([yes])],
+- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
+-
+- CC="$HOST_CXX"
+- CFLAGS="$HOST_CXXFLAGS"
+-
+- AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
+- AC_TRY_COMPILE([], [return(0);],
+- [ac_cv_prog_hostcxx_works=1
+- AC_MSG_RESULT([yes])],
+- AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
+-
+- CC=$_SAVE_CC
+- CFLAGS=$_SAVE_CFLAGS
+- LDFLAGS=$_SAVE_LDFLAGS
+-
+- case "$build:$target" in
+- powerpc-apple-darwin8*:i?86-apple-darwin*)
+- dnl The Darwin cross compiler doesn't necessarily point itself at a
+- dnl root that has libraries for the proper architecture, it defaults
+- dnl to the system root. The libraries in the system root on current
+- dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
+- dnl checks will fail. Fake a working SDK in that case.
+- _SAVE_CFLAGS=$CFLAGS
+- _SAVE_CXXFLAGS=$CXXLAGS
+- CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
+- CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
+- ;;
+- esac
+-
+- AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", :)
+- unset ac_cv_prog_CC
+- AC_PROG_CC
+- AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
+- unset ac_cv_prog_CXX
+- AC_PROG_CXX
+-
+- case "$build:$target" in
+- powerpc-apple-darwin8*:i?86-apple-darwin*)
+- dnl Revert the changes made above. From this point on, the target
+- dnl compiler will never be used without applying the SDK to CFLAGS
+- dnl (see --with-macos-sdk below).
+- CFLAGS=$_SAVE_CFLAGS
+- CXXFLAGS=$_SAVE_CXXFLAGS
+- ;;
+- esac
+-
+- AC_CHECK_PROGS(RANLIB, $RANLIB "${target_alias}-ranlib" "${target}-ranlib", :)
+- AC_CHECK_PROGS(AR, $AR "${target_alias}-ar" "${target}-ar", :)
+- AC_PATH_PROGS(AS, $AS "${target_alias}-as" "${target}-as", :)
+- AC_CHECK_PROGS(LD, $LD "${target_alias}-ld" "${target}-ld", :)
+- AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
+- AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
+- AC_DEFINE(CROSS_COMPILE)
++ echo >&2 Cross compile block breaks whole configure script
++ exit 1
+ else
+ AC_PROG_CC
+ AC_PROG_CXX
================================================================
Index: packages/instantbird/syslibs.patch
diff -u /dev/null packages/instantbird/syslibs.patch:1.1
--- /dev/null Mon Aug 17 16:21:13 2009
+++ packages/instantbird/syslibs.patch Mon Aug 17 16:21:07 2009
@@ -0,0 +1,22 @@
+--- mozilla/client.mk~ 2009-03-26 22:42:26.000000000 +0200
++++ mozilla/client.mk 2009-07-29 02:05:48.096533504 +0300
+@@ -168,8 +168,6 @@
+
+ # 'configure' scripts generated by autoconf.
+ CONFIGURES := $(TOPSRCDIR)/configure
+-CONFIGURES += $(TOPSRCDIR)/nsprpub/configure
+-CONFIGURES += $(TOPSRCDIR)/js/src/configure
+
+ #######################################################################
+ # Rules
+--- mozilla/configure.in~ 2009-07-29 21:19:34.000000000 +0300
++++ mozilla/configure.in 2009-07-29 21:19:36.759597855 +0300
+@@ -8337,7 +8337,7 @@
+ if test "$MOZ_MEMORY"; then
+ ac_configure_args="$ac_configure_args --enable-jemalloc"
+ fi
+-AC_CONFIG_SUBDIRS(js/src)
++dnl AC_CONFIG_SUBDIRS(js/src)
+ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
+
+ fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/instantbird/instantbird.spec?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/instantbird/mozilla-ac.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list