diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2010-12-10 15:09:00 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2010-12-10 15:09:00 +0000 |
| commit | 5a8c19bcf2cf49113e4c29573c6555aa8e05a608 (patch) | |
| tree | c0e4df659784ab7942f53066282936f60ef9751b /lang | |
| parent | Update to latest snapshot. (diff) | |
Rather than relying on some hackish patches use thre --disable-docs
configure option in the NOPORTDOCS case.
This should result in no changes to packages.
Notes
Notes:
svn path=/head/; revision=265985
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/clang-devel/Makefile | 6 | ||||
| -rw-r--r-- | lang/clang-devel/files/patch-Makefile | 14 | ||||
| -rw-r--r-- | lang/clang-devel/files/patch-tools_clang_Makefile | 14 |
3 files changed, 1 insertions, 33 deletions
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile index 714ad322cfdd..0439f2c2a440 100644 --- a/lang/clang-devel/Makefile +++ b/lang/clang-devel/Makefile @@ -58,9 +58,7 @@ CONFIGURE_ARGS+= --enable-optimized .endif .if defined(NOPORTDOCS) -DOCSRCDIR= -.else -DOCSRCDIR= docs +CONFIGURE_ARGS+= --disable-docs .endif MAN1= clang.1 @@ -97,8 +95,6 @@ post-patch: ${WRKSRC}/Makefile.config.in ${REINPLACE_CMD} -e 's|\(PROJ_mandir.*:=\).*$$|\1${MANPREFIX}/man|g' \ ${WRKSRC}/Makefile.config.in - ${REINPLACE_CMD} -e 's|%%DOCSRCDIR%%|${DOCSRCDIR}|' \ - ${WRKSRC}/Makefile ${WRKSRC}/tools/clang/Makefile ${REINPLACE_CMD} -e 's|/usr/bin/env perl|${PERL}|' \ -e 's|%%DATADIR%%|${DATADIR}|' \ ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \ diff --git a/lang/clang-devel/files/patch-Makefile b/lang/clang-devel/files/patch-Makefile deleted file mode 100644 index d056dceae2e2..000000000000 --- a/lang/clang-devel/files/patch-Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -31,7 +31,7 @@ - OPTIONAL_DIRS := - else - DIRS := lib/Support utils lib/VMCore lib tools/llvm-shlib \ -- tools/llvm-config tools runtime docs unittests -+ tools/llvm-config tools runtime %%DOCSRCDIR%% unittests - OPTIONAL_DIRS := projects bindings - endif - diff --git a/lang/clang-devel/files/patch-tools_clang_Makefile b/lang/clang-devel/files/patch-tools_clang_Makefile deleted file mode 100644 index 331b1a29c15e..000000000000 --- a/lang/clang-devel/files/patch-tools_clang_Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- tools/clang/Makefile.orig -+++ tools/clang/Makefile -@@ -14,7 +14,7 @@ - - IS_TOP_LEVEL := 1 - CLANG_LEVEL := . --DIRS := include lib tools runtime docs -+DIRS := include lib tools runtime %%DOCSRCDIR%% - - PARALLEL_DIRS := - |