Re: pkg/45811: xulrunner doesn't build on linux

[Aleksey Cheusov <cheusov%tut.by@localhost>]

The following reply was made to PR pkg/45811; it has been noted by GNATS.

From: Aleksey Cheusov <cheusov%tut.by@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/45811: xulrunner doesn't build on linux
Date: Tue, 07 Feb 2012 23:41:55 +0300

  >> pkgsrc-2011Q4: devel/xulrunner doesn't build on Linux,
  >> anymore. It's the same problem already reported and fixed in April
  >> 2010
  >> http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=43146
  >> . Actually, the problem already came back several months ago, but I
  >> didn't bother to submit a problem report.
 >  
 >  Has the fix that was applied for PR 43146 disappeared? If so, does
 >  reapplying it make the package build again?
 
 The following patch solves the problem. This is actually a
 'cvs up -j 1.3 -j 1.2' patches/patch-me
 Unless anyone object I'll commit it.
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/xulrunner/distinfo,v
 retrieving revision 1.57
 diff -u -r1.57 distinfo
 --- distinfo   7 Jan 2012 18:47:39 -0000       1.57
 +++ distinfo   7 Feb 2012 20:40:49 -0000
 @@ -44,7 +44,7 @@
  SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
  SHA1 (patch-mb) = 131abc07f378cefcc8c2871e4fd20f306e3af61a
  SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
 -SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
 +SHA1 (patch-me) = da6324dd21a40dd3cc7b7b9321a18bd11a3434fd
  SHA1 (patch-mf) = de2d47132013a1f6fd12a0893d21eb34dd843b3e
  SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
  SHA1 (patch-mh) = 0318566ecddafd00d4abd22a08ccab3eb72eabe3
 Index: patches/patch-me
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/xulrunner/patches/patch-me,v
 retrieving revision 1.3
 diff -u -r1.3 patch-me
 --- patches/patch-me   26 Apr 2011 14:16:37 -0000      1.3
 +++ patches/patch-me   7 Feb 2012 20:40:49 -0000
 @@ -1,10 +1,22 @@
 -$NetBSD: patch-me,v 1.3 2011/04/26 14:16:37 tnn Exp $
 +$NetBSD: patch-me,v 1.2 2010/04/21 15:26:00 tnn Exp $
  
  Add DragonFly support.
 +Disable assembly routines in freebl on Linux (PR pkg/43146)
  
 ---- security/nss/lib/freebl/Makefile.orig     2009-06-29 18:15:13.000000000 
+0200
 +--- security/nss/lib/freebl/Makefile.orig     2010-04-13 22:22:54.000000000 
+0000
  +++ security/nss/lib/freebl/Makefile
 -@@ -212,7 +212,7 @@ endif
 +@@ -154,7 +154,9 @@ ifeq ($(USE_N32),1)
 + endif
 + endif
 + 
 +-ifeq ($(OS_TARGET),Linux)
 ++# pkgsrc PR pkg/43146
 ++#ifeq ($(OS_TARGET),Linux)
 ++ifeq (true, false)
 + ifeq ($(CPU_ARCH),x86_64)
 +     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
 +     ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
 +@@ -224,7 +226,7 @@ endif
   # to bind the blapi function references in FREEBLVector vector
   # (ldvector.c) to the blapi functions defined in the freebl
   # shared libraries.
 
 >  -- 
 >  David A. Holland
 >  dholland%netbsd.org@localhost
 
 -- 
 Best regards, Aleksey Cheusov.