On Wed, Jul 29, 2009 at 12:19:45PM +0300, Riku Voipio wrote:
> > Please try the attached patch on top of the previous one.
> >
> > Mike, fingers-crossed.
>
> && mv js-config.tmp js-config && chmod +x js-config
> make[1]: Leaving directory `/root/xulrunner/xulrunner-1.9.1.1/js/src'
> sed -i 's|^OS_LDFLAGS.*|& -Wl,--as-needed|' config/autoconf.mk
> LDFLAGS +=
> -Wl,--version-script=/root/xulrunner/xulrunner-1.9.1.1/debian/symbols.filter
> make: LDFLAGS: Command not found
> make: *** [config.status] Error 127
Man, I'm dumb.
Try this one (this time, it's against pristine source)
Mike
diff --git a/debian/rules b/debian/rules
index 3a043ec..af2b301 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version:
*\(.*\)$$/\1/ p')
UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version:
*\(.*\)-.*$$/\1/ p')
+GCC_4_4_OR_MORE := $(shell gcc -dumpversion | awk -F . '$$1 > 4 || ($$1 == 4
&& $$2 > 3) {print $$0}')
BASE_VERSION := 1.9.1
PYVER := $(shell pyversions -d)
@@ -46,10 +47,16 @@ endif
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += --enable-debug
-else
+endif
+ifeq (,$(filter debug noopt,$(DEB_BUILD_OPTIONS)))
GENSYMBOLS_FLAGS := -c4
endif
+JS_LDFLAGS := $(LDFLAGS)
+ifeq ($(DEB_BUILD_ARCH)$(GCC_4_4_OR_MORE),armel)
+ JS_LDFLAGS += -Wl,--version-script=$(CURDIR)/debian/symbols.filter
+endif
+
COMPONENT_PACKAGES := python-xpcom xulrunner-$(BASE_VERSION)-gnome-support
COMPONENT_SCRIPTS := $(COMPONENT_PACKAGES:%=debian/%.postinst)
$(COMPONENT_PACKAGES:%=debian/%.postrm)
GENERATED_FILES := $(COMPONENT_SCRIPTS)
debian/xulrunner-$(BASE_VERSION).postinst
@@ -76,6 +83,8 @@ config.status: ./configure debian/mozconfig
CXXFLAGS="$(CFLAGS)" \
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
$(CONFIGURE_FLAGS)
+ sed -i 's|^OS_LDFLAGS.*|& $(LDFLAGS)|' config/autoconf.mk
+ sed -i 's|^OS_LDFLAGS.*|& $(JS_LDFLAGS)|' js/src/config/autoconf.mk
build: build-stamp
@@ -87,8 +96,7 @@ build-stamp: config.status
$(MAKE) \
PYTHON_SO=$(shell objdump -p /usr/lib/lib$(PYVER).so | awk
'/SONAME/ {print $$2}') \
$(JAVA_VARS) \
- DEB_NO_JAR=1 \
- OS_LDFLAGS="$(LDFLAGS) $(shell sed -n 's/^OS_LDFLAGS\s*=\s*//p'
config/autoconf.mk)"
+ DEB_NO_JAR=1
#docbook-to-man debian/xulrunner.sgml > xulrunner.1
touch build-stamp
