allow firefox to compile

6 files changed, 54 insertions, 5 deletions

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index fbd2f2619..9c8c17373 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -83,9 +83,9 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-libjpeg-turbo \
 			--disable-elf-hack
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 XAKE_FLAGS+=		OS_RELEASE="2.6" HOST_CC=$(CC_FOR_BUILD) HOST_LDFLAGS=$(LDFLAGS_FOR_BUILD)
-XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3"
+XAKE_FLAGS+=            ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS} -lnss3 -lnssutil3 -lsmime3 -lssl3 -fPIC"
 
 firefox-install:
 	$(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 133d0fdee..e996423f4 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,5 +1,14 @@
 --- mozilla-release.orig/configure	2011-07-08 03:30:27.000000000 +0200
-+++ mozilla-release/configure	2013-02-07 16:38:49.000000000 +0100
++++ mozilla-release/configure	2013-04-04 16:11:25.000000000 +0200
+@@ -12617,7 +12617,7 @@ fi
+ 
+ if test "x$ac_cv_va_val_copy" = "xno"; then
+    cat >> confdefs.h <<\EOF
+-#define HAVE_VA_LIST_AS_ARRAY 1
++#define HAVE_VA_LIST_AS_ARRAY 0
+ EOF
+ 
+ fi
 @@ -23504,6 +23504,9 @@ fi
      fi
  fi
diff --git a/package/firefox/patches/patch-js_src_jsprf_cpp b/package/firefox/patches/patch-js_src_jsprf_cpp
new file mode 100644
index 000000000..c793f6bac
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_jsprf_cpp
@@ -0,0 +1,20 @@
+--- mozilla-release.orig/js/src/jsprf.cpp	2011-07-08 03:15:24.000000000 +0200
++++ mozilla-release/js/src/jsprf.cpp	2013-04-04 16:21:34.000000000 +0200
+@@ -54,17 +54,7 @@
+ 
+ using namespace js;
+ 
+-/*
+-** Note: on some platforms va_list is defined as an array,
+-** and requires array notation.
+-*/
+-#ifdef HAVE_VA_COPY
+-#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
+-#elif defined(HAVE_VA_LIST_AS_ARRAY)
+-#define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
+-#else
+ #define VARARGS_ASSIGN(foo, bar)        (foo) = (bar)
+-#endif
+ 
+ /*
+ ** WARNING: This code may *NOT* call JS_LOG (because JS_LOG calls it)
diff --git a/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp b/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp
new file mode 100644
index 000000000..86a9445dc
--- /dev/null
+++ b/package/firefox/patches/patch-js_src_xpconnect_src_xpcconvert_cpp
@@ -0,0 +1,20 @@
+--- mozilla-release.orig/js/src/xpconnect/src/xpcconvert.cpp	2011-07-08 03:15:26.000000000 +0200
++++ mozilla-release/js/src/xpconnect/src/xpcconvert.cpp	2013-04-04 16:30:18.000000000 +0200
+@@ -1842,17 +1842,7 @@ XPCConvert::JSErrorToXPCException(XPCCal
+ 
+ /***************************************************************************/
+ 
+-/*
+-** Note: on some platforms va_list is defined as an array,
+-** and requires array notation.
+-*/
+-#ifdef HAVE_VA_COPY
+-#define VARARGS_ASSIGN(foo, bar)	VA_COPY(foo,bar)
+-#elif defined(HAVE_VA_LIST_AS_ARRAY)
+-#define VARARGS_ASSIGN(foo, bar)	foo[0] = bar[0]
+-#else
+ #define VARARGS_ASSIGN(foo, bar)	(foo) = (bar)
+-#endif
+ 
+ // We assert below that these formats all begin with "%i".
+ const char* XPC_ARG_FORMATTER_FORMAT_STRINGS[] = {"%ip", "%iv", "%is", nsnull};
diff --git a/package/harfbuzz/Makefile b/package/harfbuzz/Makefile
index c125a10c6..29d55eeee 100644
--- a/package/harfbuzz/Makefile
+++ b/package/harfbuzz/Makefile
@@ -17,7 +17,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,HARFBUZZ,harfbuzz,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 
 harfbuzz-install:
 	$(INSTALL_DIR) $(IDIR_HARFBUZZ)/usr/lib
diff --git a/package/pango/Makefile b/package/pango/Makefile
index b5ce342d8..aae4d4dd4 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -30,7 +30,7 @@ $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ENV+=		ac_cv_path_EGREP="grep -E"
 
 pango-install: