$OpenBSD: patch-js_src_configure_in,v 1.3 2011/03/26 10:58:36 landry Exp $ --- js/src/configure.in.orig Tue Mar 16 10:55:20 2010 +++ js/src/configure.in Sat Mar 27 01:54:27 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' @@ -2466,11 +2466,15 @@ i?86-*) ENABLE_JIT=1 NANOJIT_ARCH=i386 ;; +x86_64-*) + ENABLE_JIT=1 + NANOJIT_ARCH=X64 + ;; arm*-*) ENABLE_JIT=1 NANOJIT_ARCH=ARM ;; -sparc*-*) +sparc-*) ENABLE_JIT=1 NANOJIT_ARCH=Sparc ;; @@ -2489,7 +2493,10 @@ case "$target" in i?86-*) AC_DEFINE(AVMPLUS_IA32) ;; - +x86_64-*) + AC_DEFINE(AVMPLUS_64BIT) + AC_DEFINE(AVMPLUS_AMD64) + ;; arm*-*) AC_DEFINE(AVMPLUS_ARM) ;; @@ -2509,7 +2516,7 @@ darwin*) solaris*) AC_DEFINE(AVMPLUS_UNIX) ;; -freebsd*|kfreebsd*) +freebsd*|kfreebsd*|openbsd*) AC_DEFINE(AVMPLUS_UNIX) ;; *cygwin*|*mingw*|*mks*|*msvc*|*wince)