[oe-commits] org.oe.dev wxbase: fix broken, unify
xjqian commit
oe at amethyst.openembedded.net
Sun Mar 30 06:43:08 UTC 2008
wxbase: fix broken, unify
* upgrade 2.6.2 to 2.6.4 (upstream old stable, DEFAULT)
* upgrade 2.7+cvs to 2.8.7 (upstream new stable)
* NOTE: upstream only provide mwg build targets for > 2.7
* 2.8.7: patch Makefile non-sense
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: e451e643804112f13df8ec67c5e1833a5c6771f9
ViewMTN: http://monotone.openembedded.org/revision/info/e451e643804112f13df8ec67c5e1833a5c6771f9
Files:
1
packages/wxwidgets/wxbase_2.6.2.bb
packages/wxwidgets/wxbase_2.6.4.bb
packages/wxwidgets/wxbase_2.7+cvs.bb
packages/wxwidgets/wxbase_2.8.7.bb
packages/wxwidgets/wxbase-2.8.7
packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch
packages/wxwidgets/wxbase.inc
Diffs:
#
# mt diff -r7be85b9360e24b53ef46edf834a8b99bb31d646b -re451e643804112f13df8ec67c5e1833a5c6771f9
#
#
#
# rename "packages/wxwidgets/wxbase_2.6.2.bb"
# to "packages/wxwidgets/wxbase_2.6.4.bb"
#
# rename "packages/wxwidgets/wxbase_2.7+cvs.bb"
# to "packages/wxwidgets/wxbase_2.8.7.bb"
#
# add_dir "packages/wxwidgets/wxbase-2.8.7"
#
# add_file "packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch"
# content [d8080db0d114246d6c73a05b6686c28507f58bb7]
#
# add_file "packages/wxwidgets/wxbase.inc"
# content [4738ec69cd6eb08328207aeec696ce949d662791]
#
# patch "packages/wxwidgets/wxbase_2.6.4.bb"
# from [9a0349a002c487ae06200180300c12a4fe92ec39]
# to [cfd1c0469ead8760e67d21a3ee1b1b963f1ed0f9]
#
# patch "packages/wxwidgets/wxbase_2.8.7.bb"
# from [0aeb3fb06613533a94e4896159c46c2ca079e2d1]
# to [98a18ce02394987f97007f6b643a9299f830e688]
#
============================================================
--- packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch d8080db0d114246d6c73a05b6686c28507f58bb7
+++ packages/wxwidgets/wxbase-2.8.7/Makefile.in.patch d8080db0d114246d6c73a05b6686c28507f58bb7
@@ -0,0 +1,18 @@
+--- wxBase-2.8.7/Makefile.in.old 2008-03-30 01:04:57.000000000 -0500
++++ wxBase-2.8.7/Makefile.in 2008-03-30 01:05:58.000000000 -0500
+@@ -11331,13 +11331,11 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p =
+
+ ### Targets: ###
+
+-all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
++all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+-install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
++install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
============================================================
--- packages/wxwidgets/wxbase.inc 4738ec69cd6eb08328207aeec696ce949d662791
+++ packages/wxwidgets/wxbase.inc 4738ec69cd6eb08328207aeec696ce949d662791
@@ -0,0 +1,17 @@
+DESCRIPTION = "wxBase is a library for programming \
+non-GUI (console) applications using the base wxWidgets functionality."
+HOMEPAGE = "http://www.wxwidgets.org/"
+LICENSE = "GPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib expat"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+
+S = "${WORKDIR}/wxBase-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+ oe_runconf
+}
============================================================
--- packages/wxwidgets/wxbase_2.6.2.bb 9a0349a002c487ae06200180300c12a4fe92ec39
+++ packages/wxwidgets/wxbase_2.6.4.bb cfd1c0469ead8760e67d21a3ee1b1b963f1ed0f9
@@ -1,26 +1,11 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
+require wxbase.inc
+PR = "r0"
-SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
-
-S = "${WORKDIR}/wxBase-${PV}"
-
-inherit autotools pkgconfig
-
EXTRA_OECONF = "--enable-largefile"
-LEAD_SONAME = "libwx_base-2.6.so*"
+LEAD_SONAME = "libwx_base-2.6.so"
-do_configure() {
- oe_runconf
-}
-
do_stage() {
install -d ${STAGING_INCDIR}/wx-2.6/wx
cp -pR include/wx ${STAGING_INCDIR}/wx-2.6
@@ -36,13 +21,9 @@ do_stage() {
-i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6
}
-FILES_${PN} += " \
- ${libdir}/wx/config"
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include ${datadir}/bakefile"
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
do_install() {
oe_runmake 'DESTDIR=${D}' install
ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${D}${bindir}/wx-config
============================================================
--- packages/wxwidgets/wxbase_2.7+cvs.bb 0aeb3fb06613533a94e4896159c46c2ca079e2d1
+++ packages/wxwidgets/wxbase_2.8.7.bb 98a18ce02394987f97007f6b643a9299f830e688
@@ -1,53 +1,33 @@
-DESCRIPTION = "wxBase is a library for programming \
-non-GUI (console) applications using the base wxWidgets functionality."
-HOMEPAGE = "http://www.wxwidgets.org/"
-LICENSE = "GPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "jpeg libpng zlib"
+require wxbase.inc
+DEFAULT_PREFERENCE = "-1"
-SRC_URI = "http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2"
-#SRC_URI = "${SOURCEFORGE_MIRROR}/wxwindows/wxBase-${PV}.tar.bz2"
+PR = "r0"
-S = "${WORKDIR}/wxGTK"
+SRC_URI += "file://Makefile.in.patch;patch=1"
-inherit autotools pkgconfig
+EXTRA_OECONF = " --disable-gui --enable-largefile --without-subdirs "
-EXTRA_OECONF = "--disable-gui --enable-largefile"
+LEAD_SONAME = "libwx_base-2.8.so"
-LEAD_SONAME = "libwx_base-2.7*"
-
-do_configure() {
- oe_runconf
-}
-
do_stage() {
- install -d ${STAGING_INCDIR}/wx-2.7/wx
- cp -pR include/wx ${STAGING_INCDIR}/wx-2.7
+ 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}base-ansi-release-2.7 ${STAGING_BINDIR_CROSS}/wx-config
+ ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-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}base-ansi-release-2.7
+ -i ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8
}
-FILES_${PN} += " \
- ${libdir}/wx/config"
+FILES_${PN} += "${libdir}/wx/config"
+FILES_${PN}-dev += "${libdir}/wx/include"
-FILES_${PN}-dev += " \
- ${libdir}/wx/include \
- ${datadir}/bakefile"
-
do_install() {
oe_runmake 'DESTDIR=${D}' install
- ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${D}${bindir}/wx-config
- install -d ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.txt ${D}${docdir}/${PN}-${PV}
- install -m 644 -p docs/*.htm ${D}${docdir}/${PN}-${PV}
+ ln -sf ${libdir}/wx/config/${TARGET_PREFIX}base-ansi-release-2.8 ${D}${bindir}/wx-config
}
More information about the Openembedded-commits
mailing list