mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
- Do not create empty .keep files on empty directries. This causes unexpected
crash because it is trying to mmap(2) an empty file as a Calc add-in. [1] Just use mkdir(1) to create the empty directories instead. - Use system clang by default where the clang regression is fixed (r238429). PR: ports/169837 [1]
This commit is contained in:
parent
0231102853
commit
359cd82897
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=300889
1 changed files with 6 additions and 5 deletions
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
.include "${.CURDIR}/Makefile.common"
|
.include "${.CURDIR}/Makefile.common"
|
||||||
|
|
||||||
PORTREVISION= 0
|
PORTREVISION= 1
|
||||||
|
|
||||||
MASTER_SITE_SUBDIR= src/${PORTVERSION}/
|
MASTER_SITE_SUBDIR= src/${PORTVERSION}/
|
||||||
MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \
|
MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \
|
||||||
|
@ -209,9 +209,8 @@ MANCOMPRESSED= yes
|
||||||
#USE_GCC= 4.6+
|
#USE_GCC= 4.6+
|
||||||
#DISTFILES+= bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz:ext
|
#DISTFILES+= bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz:ext
|
||||||
#.else
|
#.else
|
||||||
.if defined(WITH_SYSTEM_CLANG)
|
.if ${OSVERSION} >= 1000015 || defined(WITH_SYSTEM_CLANG)
|
||||||
# XXX Clang PR13308 (http://llvm.org/bugs/show_bug.cgi?id=13308)
|
# XXX Clang PR13308 (http://llvm.org/bugs/show_bug.cgi?id=13308)
|
||||||
# Fixed in r159895 (http://llvm.org/viewvc/llvm-project?view=rev&revision=159895)
|
|
||||||
CC= /usr/bin/clang
|
CC= /usr/bin/clang
|
||||||
CPP= /usr/bin/clang-cpp
|
CPP= /usr/bin/clang-cpp
|
||||||
CXX= /usr/bin/clang++
|
CXX= /usr/bin/clang++
|
||||||
|
@ -413,7 +412,8 @@ post-configure:
|
||||||
post-install:
|
post-install:
|
||||||
@${RM} -f ${PLISTF} ${PLISTD}
|
@${RM} -f ${PLISTF} ${PLISTD}
|
||||||
# It seems that the empty directories are necessary for libreoffice keep them for now
|
# It seems that the empty directories are necessary for libreoffice keep them for now
|
||||||
@${FIND} ${LODESTDIR}/${PREFIX}/lib -type d -empty -exec ${TOUCH} {}/.keep \;
|
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d -empty \
|
||||||
|
-exec ${ECHO_CMD} "@exec ${MKDIR} %D/{}" \; >> ${PLISTD}
|
||||||
|
|
||||||
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s lib \( -type f -o -type l \) -print >> ${PLISTF}
|
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s lib \( -type f -o -type l \) -print >> ${PLISTF}
|
||||||
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
|
@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
|
||||||
|
@ -444,7 +444,8 @@ post-install:
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
@${SORT} ${PLISTF} >> ${TMPPLIST}
|
@${SORT} ${PLISTF} >> ${TMPPLIST}
|
||||||
@${SORT} -r ${PLISTD} >> ${TMPPLIST}
|
@${GREP} ^@exec ${PLISTD} | ${SORT} >> ${TMPPLIST}
|
||||||
|
@${GREP} -v ^@exec ${PLISTD} | ${SORT} -r >> ${TMPPLIST}
|
||||||
|
|
||||||
.if ${PORT_OPTIONS:MSDK}
|
.if ${PORT_OPTIONS:MSDK}
|
||||||
.for subdir in include share/idl share/libreoffice share/doc
|
.for subdir in include share/idl share/libreoffice share/doc
|
||||||
|
|
Loading…
Add table
Reference in a new issue