Date: Thu, 7 Feb 2013 13:04:30 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311833 - in head/archivers: p7zip paq par2cmdline-tbb pbzip2 ppmd-7z Message-ID: <201302071304.r17D4USS055347@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Feb 7 13:04:29 2013 New Revision: 311833 URL: http://svnweb.freebsd.org/changeset/ports/311833 Log: - Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: archivers) Approved by: portmgr Modified: head/archivers/p7zip/Makefile (contents, props changed) head/archivers/paq/Makefile head/archivers/par2cmdline-tbb/Makefile head/archivers/pbzip2/Makefile (contents, props changed) head/archivers/ppmd-7z/Makefile (contents, props changed) Modified: head/archivers/p7zip/Makefile ============================================================================== --- head/archivers/p7zip/Makefile Thu Feb 7 13:00:58 2013 (r311832) +++ head/archivers/p7zip/Makefile Thu Feb 7 13:04:29 2013 (r311833) @@ -61,12 +61,11 @@ CFLAGS+= -fPIC .endif post-patch: - ${SED} -e 's!-O!${CFLAGS} ${PTHREAD_CFLAGS}!' \ + ${SED} -e 's!-O!${CFLAGS}!' \ -e 's!g\+\+!${CXX}!' \ -e 's!gcc!${CC}!' \ -e 's/-D_LARGEFILE_SOURCE//' \ -e 's/-D_FILE_OFFSET_BITS=64//' \ - -e 's/-lpthread/${PTHREAD_LIBS}/' \ ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine ${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \ ${WRKSRC}/man1/* Modified: head/archivers/paq/Makefile ============================================================================== --- head/archivers/paq/Makefile Thu Feb 7 13:00:58 2013 (r311832) +++ head/archivers/paq/Makefile Thu Feb 7 13:04:29 2013 (r311833) @@ -69,7 +69,7 @@ PORTDATA= ${WDATA} ${DDATA} zpsfx .endif .if ${PORT_OPTIONS:MOPENMP} -PTHREAD_CFLAGS+= -fopenmp +OPENMP_CFLAGS+= -fopenmp USE_GCC= any .endif @@ -98,8 +98,8 @@ do-build: .endif @cd ${WRKSRC}; \ ${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \ - ${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPAQFLAGS} \ - -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} ${PTHREAD_LIBS}; \ + ${CXX} ${CXXFLAGS} ${OPENMP_CFLAGS} ${ZPAQFLAGS} \ + -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} -pthread; \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} \ -o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp Modified: head/archivers/par2cmdline-tbb/Makefile ============================================================================== --- head/archivers/par2cmdline-tbb/Makefile Thu Feb 7 13:00:58 2013 (r311832) +++ head/archivers/par2cmdline-tbb/Makefile Thu Feb 7 13:04:29 2013 (r311833) @@ -22,7 +22,7 @@ LIB_DEPENDS= tbb:${PORTSDIR}/devel/tbb ONLY_FOR_ARCHS= i386 amd64 ia64 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -L${LOCALBASE}/lib -pthread USE_AUTOTOOLS= aclocal automake autoconf USE_GCC= 4.2+ Modified: head/archivers/pbzip2/Makefile ============================================================================== --- head/archivers/pbzip2/Makefile Thu Feb 7 13:00:58 2013 (r311832) +++ head/archivers/pbzip2/Makefile Thu Feb 7 13:04:29 2013 (r311833) @@ -28,8 +28,7 @@ PLIST_FILES= bin/pbzip2 bin/pbunzip2 post-patch: @${REINPLACE_CMD} \ - -e 's,-pthread -lpthread,${PTHREAD_LIBS},g; \ - s,-O2,${CXXFLAGS},; \ + -e 's,-O2,${CXXFLAGS},; \ s,^CC,#CC,; \ s,CC,CXX,' ${WRKSRC}/Makefile Modified: head/archivers/ppmd-7z/Makefile ============================================================================== --- head/archivers/ppmd-7z/Makefile Thu Feb 7 13:00:58 2013 (r311832) +++ head/archivers/ppmd-7z/Makefile Thu Feb 7 13:04:29 2013 (r311833) @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/p7zip_${DISTVERSION} BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone MAKEFILE= makefile PLIST_FILES= bin/${PKGBASE} -MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="${PTHREAD_LIBS}" +MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread" post-patch: @${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302071304.r17D4USS055347>