[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Bug#598956: On kfreebsd going into web pane segfaults Liferea.



Mike Hommey wrote:
> tags 598956 - patch
> thanks
> 
> On Mon, Oct 04, 2010 at 08:33:53AM +0100, Michael Dorrington wrote:
>> Patch fixes issue on kfreebsd where webkit crashes due to Javascript with JIT.
>> --- webkit-1.2.4/debian/rules	2010-09-03 22:29:30.000000000 +0100
>> +++ webkit-1.2.4-disablejit/debian/rules	2010-10-03 15:58:35.000000000 +0100
>> @@ -54,6 +54,7 @@
>>  		--host=$(DEB_HOST_GNU_TYPE) \
>>  		--build=$(DEB_BUILD_GNU_TYPE) \
>>  		--enable-gtk-doc \
>> +		--disable-jit \
>>  		--enable-introspection
>>  
>>  	$(MAKE) $(MAKEARGUMENTS) -C build
> 
> Even if the idea is there, we can't call that a patch. It can't be
> applied as is. It should at least disable jit only on kfreebsd.

I've added the code to make it only apply to kfreebsd, see attached
patch. Is this good enough to be classed as a patch?

Regards,
Mike.
Patch fixes issue on kfreebsd where webkit crashes due to Javascript with JIT.
--- webkit-1.2.4/debian/rules	2010-09-03 22:29:30.000000000 +0100
+++ webkit-1.2.4-disablejit/debian/rules	2010-10-04 19:18:10.000000000 +0100
@@ -5,6 +5,7 @@
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 CFLAGS = -g -Wall
 
@@ -22,6 +23,13 @@
         CFLAGS += -gstabs
 endif
 
+CONF_FLAGS =	--enable-gtk-doc \
+		--enable-introspection
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+        CONF_FLAGS += --disable-jit
+endif
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEARGUMENTS += -j$(NUMJOBS)
@@ -53,8 +61,7 @@
 	../configure --prefix=/usr \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
-		--enable-gtk-doc \
-		--enable-introspection
+		$(CONF_FLAGS)
 
 	$(MAKE) $(MAKEARGUMENTS) -C build
 

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: