diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-04-14 16:31:48 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-04-14 16:31:48 -0700 |
| commit | 3189734f8d6b1287c757cb9664d7e045ab3c57d7 (patch) | |
| tree | 5c3d50c45086d94994eb5c750f3c3d9ae9b5c924 /recipes/wxwidgets | |
| parent | 9396869c27c4f4cbf093c356a8df20965ee929ad (diff) | |
| parent | 06b6c395daf1cc41c95f8e2f094ea3b1e97d6d7b (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/wxwidgets')
| -rw-r--r-- | recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb | 29 | ||||
| -rw-r--r-- | recipes/wxwidgets/wxwidgets.inc | 5 | ||||
| -rw-r--r-- | recipes/wxwidgets/wxwidgets_2.8.10.bb (renamed from recipes/wxwidgets/wxwidgets_2.8.9.bb) | 0 |
3 files changed, 33 insertions, 1 deletions
diff --git a/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb b/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb new file mode 100644 index 0000000000..54ae04d8bb --- /dev/null +++ b/recipes/wxwidgets/wxwidgets-unicode_2.8.10.bb @@ -0,0 +1,29 @@ +PR = "r0" + +LEAD_SONAME = "libwx_gtk2_core-2.8.so" + +EXTRA_OECONF += "--enable-unicode=yes" + +S = "wxWidgets-${PV}" + +require wxwidgets.inc + +do_stage() { + install -d ${STAGING_INCDIR}/wx-2.8/wx + cp -pR include/wx ${STAGING_INCDIR}/wx-2.8 + cp -pR lib/libwx* ${STAGING_LIBDIR} + cp -pR lib/wx ${STAGING_LIBDIR} + cp -pR build/bakefiles/wxpresets/presets ${STAGING_DATADIR}/bakefile + cp -pR wxwin.m4 ${STAGING_DATADIR}/aclocal + ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${STAGING_BINDIR_CROSS}/wx-config + sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \ + -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \ + -e s,'libdir=".*"','libdir="${STAGING_LIBDIR}"', \ + -e s,'includedir=".*"','includedir="${STAGING_INCDIR}"', \ + -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + ln -sf ${libdir}/wx/config/${TARGET_PREFIX}gtk2-ansi-release-2.8 ${D}${bindir}/wx-config +} diff --git a/recipes/wxwidgets/wxwidgets.inc b/recipes/wxwidgets/wxwidgets.inc index 1e4cd0b6bb..19952948bb 100644 --- a/recipes/wxwidgets/wxwidgets.inc +++ b/recipes/wxwidgets/wxwidgets.inc @@ -10,7 +10,10 @@ S = "${WORKDIR}/wxWidgets-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = " --enable-gpe " +EXTRA_OECONF = " --enable-gpe --disable-visibility " + +CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}" + do_configure() { oe_runconf diff --git a/recipes/wxwidgets/wxwidgets_2.8.9.bb b/recipes/wxwidgets/wxwidgets_2.8.10.bb index 8e8d3565fd..8e8d3565fd 100644 --- a/recipes/wxwidgets/wxwidgets_2.8.9.bb +++ b/recipes/wxwidgets/wxwidgets_2.8.10.bb |