[oe-commits] org.oe.dev merge of '14adef1cb8437a9298373d856f25c230125dcdf6'

[rpurdie commit]

merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
     and '5fb8cfe19138b98226fe92044d302c9379dad84d'

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 81780edffc3af0c4d12a2a9e46fc176ecf6d66c5
ViewMTN: http://monotone.openembedded.org/revision/info/81780edffc3af0c4d12a2a9e46fc176ecf6d66c5
Files:
1
conf/bitbake.conf
packages/fltk/efltk_2.0.7.bb
classes/sdl.bbclass
Diffs:

#
# mt diff -r14adef1cb8437a9298373d856f25c230125dcdf6 -r81780edffc3af0c4d12a2a9e46fc176ecf6d66c5
#
# 
# 
# patch "conf/bitbake.conf"
#  from [040778b31ab6668f50df7d840d46fd1abbc7c6cf]
#    to [a605bd5d4d48054b72d21c74a922a9a0a2d12a76]
# 
============================================================
--- conf/bitbake.conf	040778b31ab6668f50df7d840d46fd1abbc7c6cf
+++ conf/bitbake.conf	a605bd5d4d48054b72d21c74a922a9a0a2d12a76
@@ -216,18 +216,18 @@ STAGING_DIR_NATIVE = "${STAGING_DIR}/${B
 STAGING_DIR = "${TMPDIR}/staging"
 
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
-STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}/bin"
-STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}/bin/${HOST_SYS}"
-STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}/lib"
-STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}/include"
-STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}/etc"
-STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}/share"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_bindir}"
+STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${layout_bindir}/${HOST_SYS}"
+STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_libdir}"
+STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_includedir}"
+STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_sysconfdir}"
+STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${layout_datadir}"
 
 STAGING_DIR_HOST = "${STAGING_DIR}/${HOST_SYS}"
-STAGING_BINDIR = "${STAGING_DIR_HOST}/bin"
-STAGING_LIBDIR = "${STAGING_DIR_HOST}/lib"
-STAGING_INCDIR = "${STAGING_DIR_HOST}/include"
-STAGING_DATADIR = "${STAGING_DIR_HOST}/share"
+STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}"
+STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}"
+STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}"
+STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}"
 STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader"
 STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware"
 STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4"
@@ -310,7 +310,7 @@ export PATH_prepend = "${STAGING_BINDIR_
 # Build utility info.
 ##################################################################
 
-CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+CCACHE = "${@bb.which(bb.data.getVar('PATH', d, 1), 'ccache') and 'ccache '}"
 TOOLCHAIN_OPTIONS = ""
 
 export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
@@ -351,10 +351,12 @@ export BUILD_CPPFLAGS = "-isystem${STAGI
 ##################################################################
 
 export BUILD_CPPFLAGS = "-isystem${STAGING_INCDIR_NATIVE}"
+BUILDSDK_CPPFLAGS = "-isystem${STAGING_INCDIR}"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
-export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}/include"
+export TARGET_CPPFLAGS = "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
 
 export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
+BUILDSDK_CFLAGS = "${BUILDSDK_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
 export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
 
@@ -365,9 +367,14 @@ export BUILD_LDFLAGS = "-L${STAGING_LIBD
 export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
                         -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1"
+
+BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
+                    -Wl,-rpath-link,${STAGING_LIBDIR} \
+                    -Wl,-rpath,${libdir} -Wl,-O1"
+
 export LDFLAGS = "${TARGET_LDFLAGS}"
-export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}/lib \
-                         -Wl,-rpath-link,${STAGING_DIR_TARGET}/lib \
+export TARGET_LDFLAGS = "-L${STAGING_DIR_TARGET}${layout_libdir} \
+                         -Wl,-rpath-link,${STAGING_DIR_TARGET}${layout_libdir} \
                          -Wl,-O1"
 
 # Which flags to leave by strip-flags() in bin/build/oebuild.sh ?


#
# mt diff -r5fb8cfe19138b98226fe92044d302c9379dad84d -r81780edffc3af0c4d12a2a9e46fc176ecf6d66c5
#
# 
# 
# add_file "packages/fltk/efltk_2.0.7.bb"
#  content [517c26248bfb9ee15cc164e0da939463e64635a8]
# 
# patch "classes/sdl.bbclass"
#  from [5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0]
#    to [d03f6596dbd93ec0a728e892a635a3627562ac60]
# 
============================================================
--- packages/fltk/efltk_2.0.7.bb	517c26248bfb9ee15cc164e0da939463e64635a8
+++ packages/fltk/efltk_2.0.7.bb	517c26248bfb9ee15cc164e0da939463e64635a8
@@ -0,0 +1,67 @@
+DESCRIPTION = "EFLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://equinox-project.org/page/documentation"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "zlib jpeg libpng libxext libxft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz"
+S = "${WORKDIR}/efltk"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "\
+  --enable-shared \
+  --enable-xdbe \
+  --enable-xft \
+  --enable-gl \
+  --disable-mysql \
+  --disable-unixODBC \
+  --x-includes=${STAGING_INCDIR}/freetype2 \
+  --x-libraries=${STAGING_LIBDIR} \
+"
+
+# yes, this is nasty, but configure is so broken there is no other way
+do_configure() {
+	gnu-configize
+	oe_runconf
+	mv -f config.h save
+	autotools_do_configure
+	mv -f save config.h
+}
+
+# more nasties
+do_configure_append() {
+	sed -i s,/usr/include,${STAGING_INCDIR}, makeinclude
+	sed -i s,/usr/include/freetype2,, makeinclude
+	sed -i s,/usr/bin/strip,echo, makeinclude
+	sed -i s,CONFIGDIR,'"${datadir}/ede/"', src/core/Fl_Config.cpp
+}
+
+do_stage() {
+    oe_runmake install prefix="${STAGING_DIR}" \
+              bindir="${STAGING_BINDIR}" \
+              includedir="${STAGING_INCDIR}" \
+              libdir="${STAGING_LIBDIR}" \
+              datadir="${STAGING_DATADIR}"
+}
+
+do_install () {
+	install -d ${D}${libdir}
+    oe_runmake install prefix="${D}${prefix}" \
+               bindir="${D}${bindir}" \
+               libdir="${D}${libdir}" \
+               includedir="${D}${includedir}" \
+               datadir="${STAGING_DATADIR}"
+}
+
+python populate_packages_prepend () {
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libefltk${PV}', d)
+}
+
+LEAD_SONAME = "libefltk.so"
+
+FILES_${PN} += "${libdir}/fltk/*.theme"
+FILES_${PN}-dbg += "${libdir}/fltk/.debug"
============================================================
--- classes/sdl.bbclass	5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0
+++ classes/sdl.bbclass	d03f6596dbd93ec0a728e892a635a3627562ac60
@@ -8,6 +8,8 @@ APPIMAGE ?= "${WORKDIR}/${PN}.png"
 APPNAME ?= "${PN}"
 APPIMAGE ?= "${WORKDIR}/${PN}.png"
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
 sdl_do_sdl_install() {
 	install -d ${D}${datadir}/applications
 	install -d ${D}${datadir}/pixmaps