diff options
| author | Emanuel Haupt <ehaupt@FreeBSD.org> | 2018-04-05 12:39:29 +0000 |
|---|---|---|
| committer | Emanuel Haupt <ehaupt@FreeBSD.org> | 2018-04-05 12:39:29 +0000 |
| commit | e158253949940614510c9e9abef81a8268d09a81 (patch) | |
| tree | 06bc0eff31d780604a99dde0ab734bbfbecfb351 /archivers | |
| parent | devel/awscli: Update 1.14.68 -> 1.15.0 (diff) | |
Fix build with clang 6.
PR: 226176 (related)
Notified by: emaste (fix provided via mail)
Notes
Notes:
svn path=/head/; revision=466555
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/ppmd/Makefile | 9 | ||||
| -rw-r--r-- | archivers/ppmd/files/patch-PPMd.cpp | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/archivers/ppmd/Makefile b/archivers/ppmd/Makefile index 0fceac0bf922..24cb25725a68 100644 --- a/archivers/ppmd/Makefile +++ b/archivers/ppmd/Makefile @@ -14,17 +14,10 @@ PLIST_FILES= bin/ppmd man/man1/ppmd.1.gz OPTIONS_DEFINE= DOCS -.include <bsd.port.pre.mk> - -# does not compile with clang 6.0.0 -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200056 -USE_GCC= yes -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/archivers/ppmd/files/patch-PPMd.cpp b/archivers/ppmd/files/patch-PPMd.cpp new file mode 100644 index 000000000000..455742d14af0 --- /dev/null +++ b/archivers/ppmd/files/patch-PPMd.cpp @@ -0,0 +1,11 @@ +--- PPMd.cpp.orig 2005-08-11 09:00:41 UTC ++++ PPMd.cpp +@@ -423,7 +423,7 @@ int main(int argc, char *argv[]) + default : printsilent(MTxt[5],argv[i]); return -1; + } + +- printsilent("Fast PPMII compressor for textual data, variant %c, "__DATE__"\n",char(Variant)); ++ printsilent("Fast PPMII compressor for textual data, variant %c, " __DATE__ "\n",char(Variant)); + + FILE_LIST_NODE* pNode, * pFirstNode=NULL, ** ppNode=&pFirstNode; + for (ENV_FILE_FINDER eff;i < argc;i++) { |