Tue Jan 7 01:59:36 2014 UTC ()
Replace with a simple -e x for sed.


(joerg)
diff -r1.27 -r1.28 src/external/bsd/llvm/include/Makefile
cvs diff -r1.27 -r1.28 src/external/bsd/llvm/include/Attic/Makefile (expand / switch to unified diff)

--- src/external/bsd/llvm/include/Attic/Makefile 2014/01/05 16:38:06 1.27
+++ src/external/bsd/llvm/include/Attic/Makefile 2014/01/07 01:59:36 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2014/01/05 16:38:06 joerg Exp $ 1# $NetBSD: Makefile,v 1.28 2014/01/07 01:59:36 joerg Exp $
2 2
3.include <bsd.init.mk> 3.include <bsd.init.mk>
4 4
5.PATH: ${CLANG_SRCDIR}/lib/Headers 5.PATH: ${CLANG_SRCDIR}/lib/Headers
6 6
7.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 7.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
8INCS= __wmmintrin_aes.h \ 8INCS= __wmmintrin_aes.h \
9 __wmmintrin_pclmul.h \ 9 __wmmintrin_pclmul.h \
10 ammintrin.h \ 10 ammintrin.h \
11 avx2intrin.h \ 11 avx2intrin.h \
12 avxintrin.h \ 12 avxintrin.h \
13 bmi2intrin.h \ 13 bmi2intrin.h \
14 bmiintrin.h \ 14 bmiintrin.h \
@@ -140,42 +140,42 @@ clang/Basic/Version.inc: ${LLVM_TOPLEVEL @@ -140,42 +140,42 @@ clang/Basic/Version.inc: ${LLVM_TOPLEVEL
140 printf '#define CLANG_VERSION ${CLANG_VERSION}\n' > ${.TARGET}.tmp 140 printf '#define CLANG_VERSION ${CLANG_VERSION}\n' > ${.TARGET}.tmp
141 printf '#define CLANG_VERSION_MAJOR ${CLANG_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp 141 printf '#define CLANG_VERSION_MAJOR ${CLANG_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
142 printf '#define CLANG_VERSION_MINOR ${CLANG_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp 142 printf '#define CLANG_VERSION_MINOR ${CLANG_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
143 mv ${.TARGET}.tmp ${.TARGET} 143 mv ${.TARGET}.tmp ${.TARGET}
144 144
145.ifndef HOST_BUILD 145.ifndef HOST_BUILD
146 146
147DPSRCS+= llvm/Config/config.h llvm/Config/llvm-config.h 147DPSRCS+= llvm/Config/config.h llvm/Config/llvm-config.h
148CLEANFILES+= llvm/Config/config.h llvm/Config/llvm-config.h 148CLEANFILES+= llvm/Config/config.h llvm/Config/llvm-config.h
149 149
150llvm/Config/config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in 150llvm/Config/config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in
151 mkdir -p ${.TARGET:H} 151 mkdir -p ${.TARGET:H}
152 ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \ 152 ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
153 -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \ 153 -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \
154 < ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in | \ 154 < ${LLVM_TOPLEVEL}/config/llvm/Config/config.h.in \
155 head -n -1 > ${.TARGET}.tmp 155 > ${.TARGET}.tmp
156 printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp 156 printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
157 printf '#define PACKAGE_VERSION "${LLVM_VERSION} (trunk ${LLVM_REVISION})"\n' >> ${.TARGET}.tmp 157 printf '#define PACKAGE_VERSION "${LLVM_VERSION} (trunk ${LLVM_REVISION})"\n' >> ${.TARGET}.tmp
158 printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp 158 printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
159 printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp 159 printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
160 printf '#endif\n' >> ${.TARGET}.tmp 160 printf '#endif\n' >> ${.TARGET}.tmp
161 mv ${.TARGET}.tmp ${.TARGET} 161 mv ${.TARGET}.tmp ${.TARGET}
162 162
163llvm/Config/llvm-config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in 163llvm/Config/llvm-config.h: ${LLVM_TOPLEVEL}/Makefile.inc ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in
164 mkdir -p ${.TARGET:H} 164 mkdir -p ${.TARGET:H}
165 ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \ 165 ${TOOL_SED} -e /LLVM_DEFAULT_TARGET_TRIPLE/d -e /LLVM_NATIVE_/d \
166 -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d \ 166 -e /LLVM_VERSION_/d -e /PACKAGE_VERSION/d -e 'x' \
167 < ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in | \ 167 < ${LLVM_TOPLEVEL}/config/llvm/Config/llvm-config.h.in \
168 head -n -1 > ${.TARGET}.tmp 168 > ${.TARGET}.tmp
169 printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp 169 printf '#define LLVM_DEFAULT_TARGET_TRIPLE "${MACHINE_GNU_PLATFORM}"\n' >> ${.TARGET}.tmp
170 printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp 170 printf '#define LLVM_VERSION_MAJOR ${LLVM_VERSION:C,\.[0-9]*,,}\n' >> ${.TARGET}.tmp
171 printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp 171 printf '#define LLVM_VERSION_MINOR ${LLVM_VERSION:C,[0-9]*\.,,}\n' >> ${.TARGET}.tmp
172 printf '#endif\n' >> ${.TARGET}.tmp 172 printf '#endif\n' >> ${.TARGET}.tmp
173 mv ${.TARGET}.tmp ${.TARGET} 173 mv ${.TARGET}.tmp ${.TARGET}
174 174
175run-configure: 175run-configure:
176 [ ! -d tmp ] || rm -r tmp 176 [ ! -d tmp ] || rm -r tmp
177 mkdir -p tmp 177 mkdir -p tmp
178 cd tmp && ${LLVM_SRCDIR}/configure ${LLVM_CONFIGURE_ARGS} \ 178 cd tmp && ${LLVM_SRCDIR}/configure ${LLVM_CONFIGURE_ARGS} \
179 CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:N-Werror:Q} \ 179 CC=${CC:Q} CFLAGS=${CFLAGS:N-Werror:Q} CXX=${CXX:Q} CXXFLAGS=${CXXFLAGS:N-Werror:Q} \
180 CPPFLAGS=${CPPFLAGS:N-std=c++11:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \ 180 CPPFLAGS=${CPPFLAGS:N-std=c++11:Q} LDFLAGS=${LDFLAGS:Q} LD=${LD:Q} LIBS=-lm \
181 ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_file=yes llvm_cv_c_printf_a=yes 181 ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_file=yes llvm_cv_c_printf_a=yes