Attachment #245844 for bug #329533

View | Details | Raw Unified | Return to bug 329533
Collapse All | Expand All

Lines 289-295 qt4-build_src_prepare() { Link Here

(-)eclass/qt4-build.eclass (-1 / +1 lines)
289	sed -i -e '/^QMAKE_$LIB\\|INC$DIR$_X11\\|_OPENGL\\|$\t/s/=.*$/=/' \	289	sed -i -e '/^QMAKE_$LIB\\|INC$DIR$_X11\\|_OPENGL\\|$\t/s/=.*$/=/' \
290	mkspecs/$(qt_mkspecs_dir)/qmake.conf \|\| die	290	mkspecs/$(qt_mkspecs_dir)/qmake.conf \|\| die
291	# strip predefined CFLAGS from qmake ( bug #312689 )	291	# strip predefined CFLAGS from qmake ( bug #312689 )
292	sed -i '/^QMAKE_CFLAGS_$RELEASE\\|DEBUG$/s:+=.*:+=:' mkspecs/common/g++.conf	292	sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
293		293
294	base_src_prepare	294	base_src_prepare
295	}	295	}

Return to bug 329533

Lines 289-295 qt4-build_src_prepare() { Link Here

(-)eclass/qt4-build.eclass (-1 / +1 lines)
289	sed -i -e '/^QMAKE_\(LIB\\|INC\)DIR\(_X11\\|_OPENGL\\|\)\t/s/=.*$/=/' \	289	sed -i -e '/^QMAKE_\(LIB\\|INC\)DIR\(_X11\\|_OPENGL\\|\)\t/s/=.*$/=/' \
290	mkspecs/$(qt_mkspecs_dir)/qmake.conf \|\| die	290	mkspecs/$(qt_mkspecs_dir)/qmake.conf \|\| die
291	# strip predefined CFLAGS from qmake ( bug #312689 )	291	# strip predefined CFLAGS from qmake ( bug #312689 )
292	sed -i '/^QMAKE_CFLAGS_\(RELEASE\\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf	292	sed -i '/^QMAKE_CFLAGS_RELEASE/s:+=.*:+=:' mkspecs/common/g++.conf
293		293
294	base_src_prepare	294	base_src_prepare
295	}	295	}