|
Lines 285-290
Link Here
|
| 285 |
# strip predefined CFLAGS from qmake ( bug #312689 ) |
285 |
# strip predefined CFLAGS from qmake ( bug #312689 ) |
| 286 |
sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf |
286 |
sed -i '/^QMAKE_CFLAGS_\(RELEASE\|DEBUG\)/s:+=.*:+=:' mkspecs/common/g++.conf |
| 287 |
|
287 |
|
|
|
288 |
if tc-is-cross-compiler ; then #add a new target for cross-compilation |
| 289 |
cp -R ${FILESDIR}/linux-cross-g++ ${S}/mkspecs |
| 290 |
fi |
| 291 |
|
| 288 |
base_src_prepare |
292 |
base_src_prepare |
| 289 |
} |
293 |
} |
| 290 |
|
294 |
|
|
Lines 300-305
Link Here
|
| 300 |
use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ |
304 |
use !elibc_glibc && [[ ${CHOST} != *-darwin* ]] && \ |
| 301 |
myconf+=" -liconv" |
305 |
myconf+=" -liconv" |
| 302 |
|
306 |
|
|
|
307 |
tc-is-cross-compiler && myconf="${myconf} -xplatform linux-cross-g++" |
| 308 |
|
| 303 |
if has glib ${IUSE//+} && use glib; then |
309 |
if has glib ${IUSE//+} && use glib; then |
| 304 |
# use -I, -L and -l from configure |
310 |
# use -I, -L and -l from configure |
| 305 |
local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" |
311 |
local glibflags="$(pkg-config --cflags --libs glib-2.0 gthread-2.0)" |
|
Lines 497-503
Link Here
|
| 497 |
echo "${S}"/mkspecs/common/*.conf |
503 |
echo "${S}"/mkspecs/common/*.conf |
| 498 |
find "${S}" -name '*.pr[io]' |
504 |
find "${S}" -name '*.pr[io]' |
| 499 |
} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die |
505 |
} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die |
|
|
506 |
if tc-is-cross-compiler ; then |
| 507 |
"${S}"/bin/qmake "LIBS+=-L${ROOT}/usr/$(get_libdir)/qt4" "CONFIG+=nostrip" || die "qmake failed" |
| 508 |
else |
| 500 |
"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" |
509 |
"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed" |
|
|
510 |
fi |
| 501 |
emake CC="$(tc-getCC)" \ |
511 |
emake CC="$(tc-getCC)" \ |
| 502 |
CXX="$(tc-getCXX)" \ |
512 |
CXX="$(tc-getCXX)" \ |
| 503 |
LINK="$(tc-getCXX)" || die "emake failed" |
513 |
LINK="$(tc-getCXX)" || die "emake failed" |
