sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-18 11:10:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Get rid of PTHREAD_CFLAGS and PTHREAD_LIBS (category: archivers)

Browse source 
Approved by:	portmgr
This commit is contained in:
Pietro Cerutti 2013-02-07 13:04:29 +00:00
parent 58f2899f48
commit 0fb0d4a3b7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=311833
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
archivers/p7zip/Makefile
View file

@ -61,12 +61,11 @@ CFLAGS+= -fPIC
.endif .endif
post-patch: post-patch:
${SED} -e 's!-O!${CFLAGS} ${PTHREAD_CFLAGS}!' \ ${SED} -e 's!-O!${CFLAGS}!' \
-e 's!g\+\+!${CXX}!' \ -e 's!g\+\+!${CXX}!' \
-e 's!gcc!${CC}!' \ -e 's!gcc!${CC}!' \
-e 's/-D_LARGEFILE_SOURCE//' \ -e 's/-D_LARGEFILE_SOURCE//' \
-e 's/-D_FILE_OFFSET_BITS=64//' \ -e 's/-D_FILE_OFFSET_BITS=64//' \
-e 's/-lpthread/${PTHREAD_LIBS}/' \
${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine ${WRKSRC}/makefile.freebsd6 > ${WRKSRC}/makefile.machine
${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \ ${REINPLACE_CMD} -e 's|{DEST_SHARE_DOC}|${DOCSDIR}|' \
${WRKSRC}/man1/* ${WRKSRC}/man1/*

6
archivers/paq/Makefile
View file

@ -69,7 +69,7 @@ PORTDATA= ${WDATA} ${DDATA} zpsfx
.endif .endif
.if ${PORT_OPTIONS:MOPENMP} .if ${PORT_OPTIONS:MOPENMP}
PTHREAD_CFLAGS+= -fopenmp OPENMP_CFLAGS+= -fopenmp
USE_GCC= any USE_GCC= any
.endif .endif
@ -98,8 +98,8 @@ do-build:
.endif .endif
@cd ${WRKSRC}; \ @cd ${WRKSRC}; \
${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \ ${CXX} ${CXXFLAGS} -o wbpe wbpe.cpp; \
${CXX} ${CXXFLAGS} ${PTHREAD_CFLAGS} ${ZPAQFLAGS} \ ${CXX} ${CXXFLAGS} ${OPENMP_CFLAGS} ${ZPAQFLAGS} \
-o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} ${PTHREAD_LIBS}; \ -o zpaq zpaq.cpp libzpaq.cpp divsufsort.c ${LDFLAGS} -pthread; \
${CXX} ${CXXFLAGS} ${ZPAQFLAGS} \ ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} \
-o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \ -o zpaqd zpaqd.cpp libzpaq.cpp ${LDFLAGS}; \
${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp ${CXX} ${CXXFLAGS} ${ZPAQFLAGS} -o zpipe zpipe.cpp libzpaq.cpp

2
archivers/par2cmdline-tbb/Makefile
View file

@ -22,7 +22,7 @@ LIB_DEPENDS= tbb:${PORTSDIR}/devel/tbb
ONLY_FOR_ARCHS= i386 amd64 ia64 ONLY_FOR_ARCHS= i386 amd64 ia64
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} LDFLAGS+= -L${LOCALBASE}/lib -pthread
USE_AUTOTOOLS= aclocal automake autoconf USE_AUTOTOOLS= aclocal automake autoconf
USE_GCC= 4.2+ USE_GCC= 4.2+

3
archivers/pbzip2/Makefile
View file

@ -28,8 +28,7 @@ PLIST_FILES= bin/pbzip2 bin/pbunzip2
post-patch: post-patch:
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's,-pthread -lpthread,${PTHREAD_LIBS},g; \ -e 's,-O2,${CXXFLAGS},; \
s,-O2,${CXXFLAGS},; \
s,^CC,#CC,; \ s,^CC,#CC,; \
s,CC,CXX,' ${WRKSRC}/Makefile s,CC,CXX,' ${WRKSRC}/Makefile

2
archivers/ppmd-7z/Makefile
View file

@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/p7zip_${DISTVERSION}
BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone BUILD_WRKSRC= ${WRKSRC}/CPP/7zip/Compress/PPMD_Alone
MAKEFILE= makefile MAKEFILE= makefile
PLIST_FILES= bin/${PKGBASE} PLIST_FILES= bin/${PKGBASE}
MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="${PTHREAD_LIBS}" MAKE_ARGS= PROG=${PORTNAME} CXX="${CXX}" LIB="-pthread"
post-patch: post-patch:
@${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\ @${REINPLACE_CMD} -e '/bool Open(LPCTSTR fileName, DWORD creationDisposition)/,/}/d'\