Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Sep 2012 14:45:53 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r989 - in trunk/devel/nspr: . files
Message-ID:  <201209051445.q85EjrX6063785@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Sep  5 14:45:53 2012
New Revision: 989

Log:
use _linux.cfg, it has support for more archs

Existing constants for i386, amd64, powerpc, powerpc64, sparc64 are
identical. With this change we get support for arm, mips, hppa, s390,
s390x, sh, avr32, m32r, mc68000, sparc.

Added:
   trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg
Modified:
   trunk/devel/nspr/Makefile

Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile	Wed Sep  5 14:45:45 2012	(r988)
+++ trunk/devel/nspr/Makefile	Wed Sep  5 14:45:53 2012	(r989)
@@ -36,7 +36,10 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e '/MDCPUCFG_H/s/freebsd/linux/' \
+		-e 's,-lpthread,${PTHREAD_LIBS},g' \
+		-e 's,echo aout,echo elf,g' \
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr

Added: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg	Wed Sep  5 14:45:53 2012	(r989)
@@ -0,0 +1,15 @@
+--- ../pr/include/md/_linux.cfg
++++ ../pr/include/md/_linux.cfg
+@@ -17,9 +17,11 @@
+ 
+ #if !defined(LINUX) && defined(__linux__)
+ #define LINUX
++#elif !defined(FREEBSD) && defined(__FreeBSD__)
++#define FREEBSD
+ #endif
+ 
+-#ifdef __FreeBSD_kernel__
++#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
+ #define PR_AF_INET6 28  /* same as AF_INET6 */
+ #elif defined(__GNU__)
+ #define PR_AF_INET6 26  /* same as AF_INET6 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209051445.q85EjrX6063785>