|
Line
Link Here
|
| 0 |
-- x11-libs/qt/qt-3.3.8-r4.ebuild |
0 |
++ x11-libs/qt/qt-3.3.8-r4.ebuild |
|
Lines 156-163
Link Here
|
| 156 |
append-flags -fno-stack-protector |
156 |
append-flags -fno-stack-protector |
| 157 |
fi |
157 |
fi |
| 158 |
|
158 |
|
| 159 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
159 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 160 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
160 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 161 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
161 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 162 |
-e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ |
162 |
-e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ |
| 163 |
-e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ |
163 |
-e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ |
|
Lines 169-174
Link Here
|
| 169 |
sed -i -e "s:/lib$:/$(get_libdir):" \ |
169 |
sed -i -e "s:/lib$:/$(get_libdir):" \ |
| 170 |
${S}/mkspecs/${PLATFORM}/qmake.conf || die |
170 |
${S}/mkspecs/${PLATFORM}/qmake.conf || die |
| 171 |
fi |
171 |
fi |
|
|
172 |
|
| 173 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ |
| 174 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 175 |
${S}/qmake/Makefile.unix |
| 172 |
} |
176 |
} |
| 173 |
|
177 |
|
| 174 |
src_compile() { |
178 |
src_compile() { |
| 175 |
-- x11-libs/qt/qt-4.3.3.ebuild |
179 |
++ x11-libs/qt/qt-4.3.3.ebuild |
|
Lines 132-139
Link Here
|
| 132 |
append-flags -fno-stack-protector |
132 |
append-flags -fno-stack-protector |
| 133 |
fi |
133 |
fi |
| 134 |
|
134 |
|
| 135 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
135 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 136 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
136 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 137 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
137 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 138 |
-e "/CONFIG/s:$: nostrip:" \ |
138 |
-e "/CONFIG/s:$: nostrip:" \ |
| 139 |
qmake.conf |
139 |
qmake.conf |
| 140 |
-- x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild |
140 |
++ x11-libs/qt-core/qt-core-4.4.0_rc1.ebuild |
|
Lines 33-38
Link Here
|
| 33 |
|
33 |
|
| 34 |
src_unpack() { |
34 |
src_unpack() { |
| 35 |
qt4-build_src_unpack |
35 |
qt4-build_src_unpack |
|
|
36 |
|
| 37 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ |
| 38 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 39 |
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix failed" |
| 36 |
} |
40 |
} |
| 37 |
|
41 |
|
| 38 |
src_compile() { |
42 |
src_compile() { |
| 39 |
-- eclass/qt4-build.eclass |
43 |
++ eclass/qt4-build.eclass |
|
Lines 50-55
Link Here
|
| 50 |
ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
50 |
ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
| 51 |
append-flags -fno-stack-protector |
51 |
append-flags -fno-stack-protector |
| 52 |
fi |
52 |
fi |
|
|
53 |
|
| 54 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 55 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 56 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 57 |
-e "s:X11R6/::" \ |
| 58 |
mkspecs/$(qt_mkspecs_dir)/qmake.conf || die "sed mkspecs/$(qt_mkspecs_dir)/qmake.conf failed" |
| 59 |
|
| 60 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 61 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 62 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 63 |
mkspecs/common/g++.conf || die "sed mkspecs/common/g++.conf failed" |
| 64 |
|
| 65 |
sed -i -e "s:X11R6/::" \ |
| 66 |
mkspecs/common/linux.conf || die "sed mkspecs/common/linux.conf failed" |
| 53 |
} |
67 |
} |
| 54 |
|
68 |
|
| 55 |
qt4-build_src_install() { |
69 |
qt4-build_src_install() { |
