summaryrefslogtreecommitdiff
path: root/moz
diff options
context:
space:
mode:
Diffstat (limited to 'moz')
-rw-r--r--moz/extractfiles.mk2
-rw-r--r--moz/makefile.mk24
-rw-r--r--moz/patches/aix_build_fix.patch203
-rw-r--r--moz/patches/libpr0n_build_fix.patch14
-rw-r--r--moz/prj/build.lst2
-rw-r--r--moz/seamonkey-source-1.1.14.patch8
6 files changed, 235 insertions, 18 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index dedfade257db..faba88b7822f 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -342,7 +342,7 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
echo >& $(NULLDEV)
.IF "$(GUI)"=="UNX"
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
cd $(RUNTIME_DIR) && strip *$(DLLPOST)
cd $(RUNTIME_DIR)$/components && strip *$(DLLPOST)
.ENDIF
diff --git a/moz/makefile.mk b/moz/makefile.mk
index feb2c50343ee..94d693580ccd 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -35,6 +35,7 @@ TARGET=ooo_mozab
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
+
# ----- pkg-config start -------
.INCLUDE .IGNORE : pkgroot.mk
.IF "$(PKGCONFIG_ROOT)"!=""
@@ -52,6 +53,11 @@ LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib
DISABLE_MOZ_EXECUTABLE=TRUE
.EXPORT : DISABLE_MOZ_EXECUTABLE
+.IF "$(OS)"=="AIX"
+LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.EXPORT : LDFLAGS
+.ENDIF
+
.IF "$(SYSBASE)"!="" && "$(OS)" == "LINUX"
## hmm... rather gcc specific switches...
CFLAGS:=-isystem $(SYSBASE)/usr/include -B$(SYSBASE)/usr/lib
@@ -87,7 +93,9 @@ PATCH_FILES = \
patches/respect_disable_pango.patch \
patches/arm_build_fix.patch \
patches/link_fontconfig.patch \
- patches/brokenmakefile.patch
+ patches/brokenmakefile.patch \
+ patches/aix_build_fix.patch \
+ patches/libpr0n_build_fix.patch
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
@@ -137,10 +145,6 @@ MOZILLA_CONFIGURE_FLAGS += --disable-tests \
--disable-pango \
--enable-extensions="pref"
-#.IF "$(GUI)"!="WNT"
-#MOZILLA_CONFIGURE_FLAGS += --enable-system-cairo
-#.ENDIF
-
#disable profilelocking to share profile with mozilla
#disable activex and activex-scripting to remove the dependence of Microsoft_SDK\src\mfc\atlbase.h
#disable gnomevfs to remove the needed of gnome develop files
@@ -181,10 +185,14 @@ CXXFLAGS+=-m64
.ENDIF
.EXPORT : CXXFLAGS
.ENDIF # "$(COMNAME)"=="sunpro5"
-.IF "$(COM)$(OS)$(CPUNAME)" == "GCCLINUXPOWERPC64"
-CXXFLAGS:=-mminimal-toc
-.EXPORT : CXXFLAGS
.ENDIF
+
+.IF "$(COM)" == "GCC"
+CXXFLAGS+=-fpermissive
+.IF "$(OS)$(CPUNAME)" == "LINUXPOWERPC64"
+CXXFLAGS+=-mminimal-toc
+.ENDIF
+.EXPORT : CXXFLAGS
.ENDIF
.IF "$(OS)"=="SOLARIS" && "$(CPUNAME)"=="SPARC" && "$(CPU)"=="U"
diff --git a/moz/patches/aix_build_fix.patch b/moz/patches/aix_build_fix.patch
new file mode 100644
index 000000000000..d778532eeb44
--- /dev/null
+++ b/moz/patches/aix_build_fix.patch
@@ -0,0 +1,203 @@
+--- misc/mozilla/nsprpub/configure 2010-08-19 07:05:19.000000000 -0500
++++ misc/build/mozilla/nsprpub/configure 2010-08-19 07:34:33.000000000 -0500
+@@ -2938,7 +2938,8 @@
+ #define SYSV 1
+ EOF
+
+- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
+ ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6
+ echo "configure:2944: checking for sys/atomic_op.h" >&5
+@@ -3067,7 +3068,6 @@
+ AIX_LINK_OPTS='-brtl -bnso -berok'
+ ;;
+ esac
+- CFLAGS="$CFLAGS -qro -qroconst"
+ AIX_WRAP='$(DIST)/lib/aixwrap.o'
+ AIX_TMP='./_aix_tmp.o'
+ if test -n "$USE_64"; then
+--- misc/mozilla/nsprpub/configure.in 2010-08-19 07:05:19.000000000 -0500
++++ misc/build/mozilla/nsprpub/configure.in 2010-08-19 07:35:35.000000000 -0500
+@@ -811,7 +811,8 @@
+ AC_DEFINE(XP_UNIX)
+ AC_DEFINE(AIX)
+ AC_DEFINE(SYSV)
+- DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib'
++ MKSHLIB='$(CCC) -shared $(DSO_LDOPTS) -o $@'
++ DSO_LDOPTS='-Wl,-brtl -Wl,-bnortllib -Wl,-blibpath:/usr/lib:/lib'
+ AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
+ case "${target_os}" in
+ aix3.2*)
+@@ -854,7 +855,6 @@
+ AIX_LINK_OPTS='-brtl -bnso -berok'
+ ;;
+ esac
+- CFLAGS="$CFLAGS -qro -qroconst"
+ AIX_WRAP='$(DIST)/lib/aixwrap.o'
+ AIX_TMP='./_aix_tmp.o'
+ if test -n "$USE_64"; then
+--- misc/mozilla/security/coreconf/AIX.mk 2010-08-19 07:04:11.000000000 -0500
++++ misc/build/mozilla/security/coreconf/AIX.mk 2010-08-19 07:38:42.000000000 -0500
+@@ -62,35 +62,30 @@
+
+ DEFAULT_COMPILER = xlc_r
+
+-CC = xlc_r
+-CCC = xlC_r
++CCC = $(CXX)
+
+ CPU_ARCH = rs6000
+
+ RANLIB = ranlib
+
+ OS_CFLAGS = -DAIX -DSYSV
+-OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm
++OS_LIBS += -Wl,-blibpath:/usr/lib:/lib -lc -lm
+
+-DSO_LDOPTS = -brtl -bnortllib -bM:SRE -bnoentry
+-MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
++DSO_LDOPTS = -Wl,-brtl -Wl,-bnortllib
++MKSHLIB = $(CC) --shared $(DSO_LDOPTS) -Wl,-blibpath:/usr/lib:/lib -lc -lm
+
+ AIX_WRAP = $(DIST)/lib/aixwrap.o
+ AIX_TMP = $(OBJDIR)/_aix_tmp.o
+
+ ifdef MAPFILE
+-DSO_LDOPTS += -bexport:$(MAPFILE)
++DSO_LDOPTS += -Wl,-bexport:$(MAPFILE)
+ else
+-DSO_LDOPTS += -bexpall
++DSO_LDOPTS += -Wl,-bexpall
+ endif
+
+ PROCESS_MAP_FILE = grep -v ';+' $< | grep -v ';-' | \
+ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@
+
+-ifdef BUILD_OPT
+- OPTIMIZER += -qmaxmem=-1
+-endif
+-
+ ifeq ($(USE_64), 1)
+ OS_CFLAGS += -DAIX_64BIT
+ OBJECT_MODE=64
+--- misc/mozilla/security/nss/cmd/platlibs.mk 2010-08-19 07:03:52.000000000 -0500
++++ misc/build/mozilla/security/nss/cmd/platlibs.mk 2010-08-19 07:39:10.000000000 -0500
+@@ -154,7 +154,7 @@
+ $(NULL)
+
+ ifeq ($(OS_ARCH), AIX)
+-EXTRA_SHARED_LIBS += -brtl
++EXTRA_SHARED_LIBS += -Wl,-brtl
+ endif
+
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+@@ -207,7 +207,7 @@
+ $(NULL)
+
+ ifeq ($(OS_ARCH), AIX)
+-EXTRA_SHARED_LIBS += -brtl
++EXTRA_SHARED_LIBS += -Wl,-brtl
+ endif
+
+ # If GNU ld is used, we must use the -rpath-link option to tell
+--- misc/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-19 07:03:57.000000000 -0500
++++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile 2010-08-19 07:42:30.000000000 -0500
+@@ -74,6 +74,10 @@
+
+ include $(CORE_DEPTH)/coreconf/rules.mk
+
++ifeq ($(OS), AIX)
++EXTRA_SHARED_LIBS += -lpthreads
++endif
++
+ #######################################################################
+ # (6) Execute "component" rules. (OPTIONAL) #
+ #######################################################################
+--- misc/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-19 07:03:57.000000000 -0500
++++ misc/build/mozilla/security/nss/cmd/shlibsign/mangle/Makefile 2010-08-19 07:41:51.000000000 -0500
+@@ -74,6 +74,8 @@
+ # (7) Execute "local" rules. (OPTIONAL). #
+ #######################################################################
+
++ifeq ($(OS), AIX)
++EXTRA_SHARED_LIBS += -lpthreads
++endif
+
+ include ../../platrules.mk
+-
+--- misc/mozilla/dbm/include/mcom_db.h 2010-08-19 08:39:18.000000000 -0500
++++ misc/build/mozilla/dbm/include/mcom_db.h 2010-08-19 08:39:45.000000000 -0500
+@@ -88,7 +88,7 @@
+
+ #ifdef __DBINTERFACE_PRIVATE
+
+-#ifdef HAVE_SYS_CDEFS_H
++#if defined(HAVE_SYS_CDEFS_H) && !defined(_AIX)
+ #include <sys/cdefs.h>
+ #else
+ #include "cdefs.h"
+--- misc/mozilla/configure 2010-08-19 09:18:07.000000000 -0500
++++ misc/build/mozilla/configure 2010-08-19 09:11:35.000000000 -0500
+@@ -5884,6 +5884,9 @@
+ CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
+ CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
+ fi
++ else
++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ fi
+ case "${target_os}" in
+ aix4.1*)
+--- misc/mozilla/configure.in 2010-08-19 09:18:07.000000000 -0500
++++ misc/build/mozilla/configure.in 2010-08-19 09:10:46.000000000 -0500
+@@ -1489,6 +1489,9 @@
+ CC_VERSION=`lslpp -Lcq vac.C 2>/dev/null | awk -F: '{ print $3 }'`
+ CXX_VERSION=`lslpp -Lcq vacpp.cmp.core 2>/dev/null | awk -F: '{ print $3 }'`
+ fi
++ else
++ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ fi
+ case "${target_os}" in
+ aix4.1*)
+--- misc/mozilla/configure 2010-08-19 11:03:27.000000000 -0500
++++ misc/build/mozilla/configure 2010-08-19 11:05:38.000000000 -0500
+@@ -5887,6 +5887,8 @@
+ else
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++ MOZ_FIX_LINK_PATHS=
++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl"
+ fi
+ case "${target_os}" in
+ aix4.1*)
+--- misc/mozilla/configure.in 2010-08-19 11:03:36.000000000 -0500
++++ misc/build/mozilla/configure.in 2010-08-19 11:04:33.000000000 -0500
+@@ -1492,6 +1492,9 @@
+ else
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
++ AC_MSG_WARN([Clearing MOZ_FIX_LINK_PATHS till we can fix bug 332075.])
++ MOZ_FIX_LINK_PATHS=
++ DSO_LDOPTS="$DSO_LDOPTS -Wl,-brtl"
+ fi
+ case "${target_os}" in
+ aix4.1*)
+--- misc/mozilla/config/rules.mk 2010-08-20 04:09:51.000000000 -0500
++++ misc/build/mozilla/config/rules.mk 2010-08-20 05:02:37.000000000 -0500
+@@ -488,8 +488,13 @@
+ ifeq ($(OS_ARCH),AIX)
+ ifdef IS_COMPONENT
+ ifneq ($(HAS_EXTRAEXPORTS),1)
++ifdef GNU_CC
++MKSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall
++MKCSHLIB += -Wl,-bE:$(MOZILLA_DIR)/build/unix/aix.exp -Wl,-bnoexpall
++else
+ MKSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall
+ MKCSHLIB += -bE:$(MOZILLA_DIR)/build/unix/aix.exp -bnoexpall
++endif # GNU_CXX
+ endif # HAS_EXTRAEXPORTS
+ endif # IS_COMPONENT
+ endif # AIX
diff --git a/moz/patches/libpr0n_build_fix.patch b/moz/patches/libpr0n_build_fix.patch
new file mode 100644
index 000000000000..083e493fe782
--- /dev/null
+++ b/moz/patches/libpr0n_build_fix.patch
@@ -0,0 +1,14 @@
+--- misc/mozilla/modules/libpr0n/build/Makefile.in 2006-05-20 19:20:48.000000000 +0200
++++ misc/build/mozilla/modules/libpr0n/build/Makefile.in 2011-01-19 05:18:01.318000024 +0100
+@@ -106,9 +106,9 @@
+ export::
+ @{ \
+ $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
+- echo "#define IMG_BUILD_DECODER_${d}";) \
++ echo "#define IMG_BUILD_DECODER_${d}" ; ) \
+ $(foreach d,$(MOZ_IMG_ENCODERS), \
+- echo "#define IMG_BUILD_ENCODER_${d}";) \
++ echo "#define IMG_BUILD_ENCODER_${d}" ; ) \
+ } > nsImgBuildDefines.tmp
+ @if `cmp -s nsImgBuildDefines.h nsImgBuildDefines.tmp`; then \
+ rm -f nsImgBuildDefines.tmp; \
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index 717c309da96e..02c1bae213df 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz moz : solenv SO:so_prereq NSS:nss NULL
+moz moz : solenv NSS:nss NULL
moz moz usr1 - all moz_mkout NULL
moz moz nmake - all moz_mozilla NULL
moz moz\zipped nmake - all moz_zipped moz_mozilla NULL
diff --git a/moz/seamonkey-source-1.1.14.patch b/moz/seamonkey-source-1.1.14.patch
index 3aabbe1a5f44..566a0445e313 100644
--- a/moz/seamonkey-source-1.1.14.patch
+++ b/moz/seamonkey-source-1.1.14.patch
@@ -195,14 +195,6 @@
mv $(_MDDEPFILE) $(_MDDEPFILE).old && \
cat $(_MDDEPFILE).old | sed -e "s|^$(<D)/||g" > $(_MDDEPFILE) && rm -f $(_MDDEPFILE).old ; \
fi
-@@ -1325,6 +1352,7 @@
-
- $(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_COMPILE) $(XPIDL_GEN_DIR)/.done
- $(REPORT_BUILD)
-+ echo "PATH=" $(PATH)
- $(ELOG) $(XPIDL_COMPILE) -m header -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
- @if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \
- then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
@@ -1696,14 +1724,14 @@
define MAKE_DEPS_NOAUTO
set -e ; \
generated by cgit (git 2.34.1) at 2024-07-09 11:34:10 +0000