Tue Mar 24 19:45:47 2020 UTC ()
qt4-libs: Deal with non-portable unused files

After extracting, remove a few files that have non-portable shell
constructs.  Both qt4-libs and qt4-tools build fine without them, so
they are obviously (slight leap) not used by the build.

(Someday, when we have a standard approach for this, this code can be
updated, but today it's important that this build.)


(gdt)
diff -r1.51 -r1.52 pkgsrc/x11/qt4-libs/Makefile.common
cvs diff -r1.51 -r1.52 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2020/03/18 21:55:23 1.51
+++ pkgsrc/x11/qt4-libs/Makefile.common 2020/03/24 19:45:47 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.51 2020/03/18 21:55:23 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.52 2020/03/24 19:45:47 gdt Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= http://download.qt.io/archive/qt/${QTVERSION:R}/${QTVERSION}/ 13MASTER_SITES= http://download.qt.io/archive/qt/${QTVERSION:R}/${QTVERSION}/
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
@@ -144,26 +144,31 @@ SUBST_FILES.lt= src/gui/gui.pro @@ -144,26 +144,31 @@ SUBST_FILES.lt= src/gui/gui.pro
144SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,' 144SUBST_SED.lt= -e 's,$$$$QMAKE_CXX -c -W,$${LIBTOOL} --mode=compile &,'
145SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,' 145SUBST_SED.lt+= -e 's,$$$${first(QMAKE_EXT_OBJ)},.lo,'
146 146
147.include "options.mk" 147.include "options.mk"
148 148
149# Reverse the change to how templates are handled made between 3.0.4 149# Reverse the change to how templates are handled made between 3.0.4
150# and 3.0.5 for older toolchains. Removing inline for newer toolchains 150# and 3.0.5 for older toolchains. Removing inline for newer toolchains
151# produces smaller code. Removing inline for older toolchains prod- 151# produces smaller code. Removing inline for older toolchains prod-
152# uces buggy code. 152# uces buggy code.
153.if !empty(CC_VERSION:Mgcc-2.8*) 153.if !empty(CC_VERSION:Mgcc-2.8*)
154CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 154CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
155.endif 155.endif
156 156
 157# Remove files with portability issues, thereby ~proving they are not used in the build.
 158post-extract:
 159 rm ${WRKSRC}/src/3rdparty/webkit/Source/JavaScriptCore/gyp/generate-dtrace-header.sh
 160 rm ${WRKSRC}/src/3rdparty/webkit/Source/WebCore/gyp/streamline-inspector-source.sh
 161
157pre-configure: 162pre-configure:
158 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \ 163 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \
159 -e 's:@X11BASE@:${X11BASE}:g' \ 164 -e 's:@X11BASE@:${X11BASE}:g' \
160 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 165 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
161 -e 's:@CC@:${CC:Q}:g' \ 166 -e 's:@CC@:${CC:Q}:g' \
162 -e 's:@CXX@:${CXX:Q}:g' \ 167 -e 's:@CXX@:${CXX:Q}:g' \
163 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 168 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
164 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 169 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
165 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 170 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
166 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 171 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
167 -e 's:@LEX@:${LEX}:g' \ 172 -e 's:@LEX@:${LEX}:g' \
168 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 173 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
169 -e 's:@AR@:${AR:Q}:g' \ 174 -e 's:@AR@:${AR:Q}:g' \