28bb810af5
Merge patches for 1.9.2 mozilla branch from firefox 3.6.x port. While here, build lightning as a subpackage using --enable-calendar. Add @pkgpath/@conflict markers for seamless upgrades.
40 lines
1.2 KiB
Plaintext
40 lines
1.2 KiB
Plaintext
$OpenBSD: patch-mozilla_js_src_configure_in,v 1.2 2010/07/27 17:01:16 landry Exp $
|
|
--- mozilla/js/src/configure.in.orig Wed Jun 23 19:46:38 2010
|
|
+++ mozilla/js/src/configure.in Wed Jul 7 08:43:19 2010
|
|
@@ -874,7 +874,7 @@ HOST_AR='$(AR)'
|
|
HOST_AR_FLAGS='$(AR_FLAGS)'
|
|
|
|
MOZ_JS_LIBS='-L$(libdir) -lmozjs'
|
|
-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
|
|
+MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib -L$(LIBXUL_DIST)/bin'
|
|
|
|
MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
|
|
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
|
|
@@ -2133,7 +2133,7 @@ case "$target" in
|
|
;;
|
|
|
|
*-openbsd*)
|
|
- DLL_SUFFIX=".so.1.0"
|
|
+ DLL_SUFFIX=".so.${SO_VERSION}"
|
|
DSO_CFLAGS=''
|
|
DSO_PIC_CFLAGS='-fPIC'
|
|
DSO_LDOPTS='-shared -fPIC'
|
|
@@ -2470,7 +2470,7 @@ arm*-*)
|
|
ENABLE_JIT=1
|
|
NANOJIT_ARCH=ARM
|
|
;;
|
|
-sparc*-*)
|
|
+sparc-*)
|
|
ENABLE_JIT=1
|
|
NANOJIT_ARCH=Sparc
|
|
;;
|
|
@@ -2509,7 +2509,7 @@ darwin*)
|
|
solaris*)
|
|
AC_DEFINE(AVMPLUS_UNIX)
|
|
;;
|
|
-freebsd*|kfreebsd*)
|
|
+freebsd*|kfreebsd*|openbsd*)
|
|
AC_DEFINE(AVMPLUS_UNIX)
|
|
;;
|
|
*cygwin*|*mingw*|*mks*|*msvc*|*wince)
|