|
Line
Link Here
|
| 0 |
-- x11-libs/qt/qt-3.3.8-r2.ebuild |
0 |
++ x11-libs/qt/qt-3.3.8-r2.ebuild |
|
Lines 146-153
Link Here
|
| 146 |
# set c/xxflags and ldflags |
146 |
# set c/xxflags and ldflags |
| 147 |
strip-flags |
147 |
strip-flags |
| 148 |
append-flags -fno-strict-aliasing |
148 |
append-flags -fno-strict-aliasing |
| 149 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
149 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 150 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
150 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 151 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
151 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 152 |
-e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ |
152 |
-e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \ |
| 153 |
-e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ |
153 |
-e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \ |
|
Lines 159-164
Link Here
|
| 159 |
sed -i -e "s:/lib$:/$(get_libdir):" \ |
159 |
sed -i -e "s:/lib$:/$(get_libdir):" \ |
| 160 |
${S}/mkspecs/${PLATFORM}/qmake.conf || die |
160 |
${S}/mkspecs/${PLATFORM}/qmake.conf || die |
| 161 |
fi |
161 |
fi |
|
|
162 |
|
| 163 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ |
| 164 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 165 |
${S}/qmake/Makefile.unix |
| 162 |
} |
166 |
} |
| 163 |
|
167 |
|
| 164 |
src_compile() { |
168 |
src_compile() { |
| 165 |
-- x11-libs/qt/qt-4.2.3-r1.ebuild |
169 |
++ x11-libs/qt/qt-4.2.3-r1.ebuild |
|
Lines 119-126
Link Here
|
| 119 |
strip-flags |
119 |
strip-flags |
| 120 |
replace-flags -O3 -O2 |
120 |
replace-flags -O3 -O2 |
| 121 |
|
121 |
|
| 122 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
122 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 123 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
123 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 124 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
124 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 125 |
qmake.conf |
125 |
qmake.conf |
| 126 |
|
126 |
|
|
Lines 134-141
Link Here
|
| 134 |
# separately as well. |
134 |
# separately as well. |
| 135 |
cd ${S}/mkspecs/common |
135 |
cd ${S}/mkspecs/common |
| 136 |
|
136 |
|
| 137 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ |
137 |
sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CPPFLAGS} ${CFLAGS} ${ASFLAGS}:" \ |
| 138 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ |
138 |
-e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS}:" \ |
| 139 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
139 |
-e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ |
| 140 |
g++.conf |
140 |
g++.conf |
| 141 |
|
141 |
|
|
Lines 145-152
Link Here
|
| 145 |
# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib |
145 |
# Replace X11R6/ directories, so /usr/X11R6/lib -> /usr/lib |
| 146 |
sed -i -e "s:X11R6/::" linux.conf |
146 |
sed -i -e "s:X11R6/::" linux.conf |
| 147 |
|
147 |
|
| 148 |
cd ${S} |
148 |
cd ${S}/qmake |
|
|
149 |
|
| 150 |
sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CPPFLAGS} ${CXXFLAGS} ${ASFLAGS} :" \ |
| 151 |
-e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \ |
| 152 |
Makefile.unix |
| 149 |
|
153 |
|
|
|
154 |
cd ${S} |
| 150 |
} |
155 |
} |
| 151 |
|
156 |
|
| 152 |
src_compile() { |
157 |
src_compile() { |
