diff options
| author | cheusov <cheusov@pkgsrc.org> | 2012-02-09 17:18:12 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2012-02-09 17:18:12 +0000 |
| commit | e62ef4c13bf68ef91f84fa65a95a71a2ea426e6b (patch) | |
| tree | 73628f85fe6e491e57ce0141b58c6967d1d71c78 | |
| parent | e058efe546371f62f9b4c7edae1ba27b3564442b (diff) | |
| download | pkgsrc-e62ef4c13bf68ef91f84fa65a95a71a2ea426e6b.tar.gz | |
Fix build failure on Linux (PR 45811).
| -rw-r--r-- | devel/xulrunner/distinfo | 4 | ||||
| -rw-r--r-- | devel/xulrunner/patches/patch-me | 18 |
2 files changed, 17 insertions, 5 deletions
diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index a6586a4aab7..00717dae2d9 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.57 2012/01/07 18:47:39 marino Exp $ +$NetBSD: distinfo,v 1.58 2012/02/09 17:18:12 cheusov Exp $ SHA1 (firefox-8.0.source.tar.bz2) = 843cf4ad70d2fc4b16654c3ff9b080d3eb357452 RMD160 (firefox-8.0.source.tar.bz2) = f87ec7668b2dcc1bb581b97e1dbe85e4b97cb31c @@ -44,7 +44,7 @@ SHA1 (patch-ipc_chromium_src_chrome_common_ipc__channel__posix.h) = 27ac2b7dbe1b 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 diff --git a/devel/xulrunner/patches/patch-me b/devel/xulrunner/patches/patch-me index 5e0e2c4ec55..aed9e5b0d00 100644 --- a/devel/xulrunner/patches/patch-me +++ b/devel/xulrunner/patches/patch-me @@ -1,10 +1,22 @@ -$NetBSD: patch-me,v 1.3 2011/04/26 14:16:37 tnn Exp $ +$NetBSD: patch-me,v 1.4 2012/02/09 17:18:12 cheusov 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. |