From owner-freebsd-gecko@FreeBSD.ORG Tue Apr 2 18:31:40 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1011A20B for ; Tue, 2 Apr 2013 18:31:40 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id A9C68EB4 for ; Tue, 2 Apr 2013 18:31:39 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r32IVcsw040279 for ; Tue, 2 Apr 2013 18:31:38 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r32IVXXs039153 for freebsd-gecko@freebsd.org; Tue, 2 Apr 2013 18:31:33 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Apr 2013 18:31:33 GMT Message-Id: <201304021831.r32IVXXs039153@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1230 - in trunk: devel/nspr devel/nspr/files security/nss security/nss/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Apr 2013 18:31:40 -0000 Author: jbeich Date: Tue Apr 2 18:31:33 2013 New Revision: 1230 Log: get rid of PTHREAD_LIBS (like ports@312209) Deleted: trunk/devel/nspr/files/patch-.._pr_tests_Makefile Modified: trunk/devel/nspr/Makefile trunk/devel/nspr/files/patch-..::configure trunk/security/nss/Makefile trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Modified: trunk/devel/nspr/Makefile ============================================================================== --- trunk/devel/nspr/Makefile Tue Apr 2 18:14:56 2013 (r1229) +++ trunk/devel/nspr/Makefile Tue Apr 2 18:31:33 2013 (r1230) @@ -21,9 +21,7 @@ MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --srcdir=${WRKSRC:H} \ - --with-pthreads -CONFIGURE_ENV= BSD_PTHREAD_LIBS=${PTHREAD_LIBS} +CONFIGURE_ARGS= --srcdir=${WRKSRC:H} MAKE_ENV= DIST=${WRKSRC}/dist @@ -39,9 +37,6 @@ CONFIGURE_ARGS+=--disable-debug .endif -post-patch: - @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT} - do-install: ${MKDIR} ${PREFIX}/include/nspr ${TAR} -C ${WRKSRC}/dist/include --dereference -cf - . | \ @@ -64,7 +59,7 @@ .endfor prtests: - ${SETENV} PTHREAD_LIBS="${PTHREAD_LIBS}" ${GMAKE} -C ${WRKSRC}/pr/tests + ${GMAKE} -C ${WRKSRC}/pr/tests ${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh Modified: trunk/devel/nspr/files/patch-..::configure ============================================================================== --- trunk/devel/nspr/files/patch-..::configure Tue Apr 2 18:14:56 2013 (r1229) +++ trunk/devel/nspr/files/patch-..::configure Tue Apr 2 18:31:33 2013 (r1230) @@ -14,15 +14,15 @@ fi MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' DSO_CFLAGS=-fPIC -@@ -6271,11 +6271,6 @@ +@@ -6271,11 +6271,9 @@ #define _THREAD_SAFE 1 EOF -- if test "$ac_cv_have_dash_pthread" = "yes"; then -- _PTHREAD_LDFLAGS="-pthread" + if test "$ac_cv_have_dash_pthread" = "yes"; then + _PTHREAD_LDFLAGS="-pthread" - else - _PTHREAD_LDFLAGS="-lc_r" -- fi + fi ;; *-netbsd*) if test "$ac_cv_have_dash_pthread" = "yes"; then Deleted: trunk/devel/nspr/files/patch-.._pr_tests_Makefile ============================================================================== --- trunk/devel/nspr/files/patch-.._pr_tests_Makefile Tue Apr 2 18:31:33 2013 (r1229) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ../../nsprpub/pr/tests/Makefile.in.orig Mon Apr 26 00:01:02 2004 -+++ ../../nsprpub/pr/tests/Makefile.in Tue Nov 28 11:08:14 2006 -@@ -418,7 +418,7 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifeq ($(USE_PTHREADS),1) --LDOPTS += -pthread -+LDOPTS += ${PTHREAD_LIBS} - endif - LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR) - endif Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Tue Apr 2 18:14:56 2013 (r1229) +++ trunk/security/nss/Makefile Tue Apr 2 18:31:33 2013 (r1230) @@ -22,11 +22,11 @@ USE_LDCONFIG= ${PREFIX}/lib/nss USE_GMAKE= yes USE_PERL5_BUILD=yes -MAKE_ENV= BSD_LDOPTS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ +MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ NSS_ENABLE_ECC=1 NSS_USE_SYSTEM_SQLITE=1 ALL_TARGET= nss_build_all -CFLAGS+= -I${LOCALBASE}/include/nspr -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc SUB_LIST= MAJOR_VERSION=${PORTVERSION:R:R} \ @@ -72,8 +72,6 @@ fi post-patch: - @${REINPLACE_CMD} -e "s|-pthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC:H:H}/security/coreconf/FreeBSD.mk @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ Modified: trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk ============================================================================== --- trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Apr 2 18:14:56 2013 (r1229) +++ trunk/security/nss/files/patch-..::coreconf::FreeBSD.mk Tue Apr 2 18:31:33 2013 (r1230) @@ -27,13 +27,7 @@ OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK -@@ -65,20 +80,20 @@ - USE_PTHREADS = 1 - DEFINES += -D_THREAD_SAFE -D_REENTRANT - OS_LIBS += -pthread --DSO_LDOPTS += -pthread -+DSO_LDOPTS += $(BSD_LDOPTS) - endif +@@ -70,15 +85,15 @@ ARCH = freebsd