[oe-commits] org.oe.dev linux-handhelds-2.6: magician defconfig: I2C_PXA=y

pH5 commit openembedded-commits at lists.openembedded.org
Wed Jan 10 07:42:27 UTC 2007


linux-handhelds-2.6: magician defconfig: I2C_PXA=y

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 032fe15bf3fd23dc5d753a8cd906ce2402067a78
ViewMTN: http://monotone.openembedded.org/revision.psp?id=032fe15bf3fd23dc5d753a8cd906ce2402067a78
Files:
1
packages/base-files/base-files/magician
packages/multimachine
packages/netbase/netbase/hx4700
packages/netbase/netbase/magician
packages/openswan/openswan-2.4.4
packages/poweroffkey
packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch
packages/libxslt/libxslt_1.1.15.bb
packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb
packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb
packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch
packages/openswan/openswan_2.4.4.bb
packages/poweroffkey/poweroffkey_0.1.bb
packages/snes9x/snes9x/configure-sizeof-void-int.patch
packages/snes9x/snes9x/makefile-1.5.patch
packages/snes9x/snes9x_1.5.bb
packages/udev/files/mount.whitelist
classes/base.bbclass
conf/distro/angstrom-2007.1.conf
conf/distro/include/preferred-gpe-versions-2.8.inc
conf/distro/include/sane-srcdates.inc
conf/machine/include/tune-iwmmxt.conf
conf/machine/magician.conf
packages/angstrom/task-angstrom-x11.bb
packages/base-files/base-files/hx4700/fstab
packages/bluez/bluez-utils_3.1.bb
packages/gaim/gaim_svn.bb
packages/gpe-nmf/gpe-nmf_0.22.bb
packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig
packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig
packages/sysvinit/sysvinit/rcS
packages/sysvinit/sysvinit/rcS-default
packages/tasks/task-base.bb
packages/tasks/task-gpe.bb
packages/udev/files/mount.sh
packages/udev/udev_100.bb
packages/util-linux/util-linux.inc
packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb
packages/xorg-xserver/xserver-kdrive_git.bb
Diffs:

#
# mt diff -r4ea7540054f909922c73afa6ec5061f51591a92c -r032fe15bf3fd23dc5d753a8cd906ce2402067a78
#
# 
# 
# add_dir "packages/base-files/base-files/magician"
# 
# add_dir "packages/multimachine"
# 
# add_dir "packages/netbase/netbase/hx4700"
# 
# add_dir "packages/netbase/netbase/magician"
# 
# add_dir "packages/openswan/openswan-2.4.4"
# 
# add_dir "packages/poweroffkey"
# 
# add_file "packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch"
#  content [f56c5b7eff4aff6f73c6b6a0abf25087d013acd3]
# 
# add_file "packages/libxslt/libxslt_1.1.15.bb"
#  content [3ca098fc11b52d22e011e9adeac31ce395dfa57f]
# 
# add_file "packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb"
#  content [e5901d5b84f2d955c2910a7a9332a8821fb2499c]
# 
# add_file "packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb"
#  content [38da0ab69740d0f6b33962776d5a77285ac2e331]
# 
# add_file "packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch"
#  content [f0c10b6604d008165119cb855f9aa38457340c57]
# 
# add_file "packages/openswan/openswan_2.4.4.bb"
#  content [0edced32fce642ee16a5bd7ddf1953661f68ac02]
# 
# add_file "packages/poweroffkey/poweroffkey_0.1.bb"
#  content [39a44f1357326a6bb1745cf16a9a852b487ef248]
# 
# add_file "packages/snes9x/snes9x/configure-sizeof-void-int.patch"
#  content [4636c02afb0c23f8e64115d5fb60b2477b24a317]
# 
# add_file "packages/snes9x/snes9x/makefile-1.5.patch"
#  content [1096953a70a69d90765d9ba53906883b187224cb]
# 
# add_file "packages/snes9x/snes9x_1.5.bb"
#  content [6ab62b55bd3ac5b61f0498545512697acec0f933]
# 
# add_file "packages/udev/files/mount.whitelist"
#  content [20ae5f93c4c84b38fb88e8e3b9238c3b5d79a9dc]
# 
# patch "classes/base.bbclass"
#  from [5ddcfa4dc313d5d17a5d55de1d73a9392ef331f1]
#    to [335628cebfe2b1e811690b1f7a12e8c5a356b50a]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [74ba0b23865c292db20b6a8606d487b1b54d4df0]
#    to [2ebb1186fd3e4e4b675b47462f57c237b46b483d]
# 
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
#  from [64e5929bf3695857cafd7b83c07636faf98de7a0]
#    to [b5e7ab57766407fe1d16f9a1765979c28248966a]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [41aaa064d51bdfde0e0e638aca98c241327b379f]
#    to [56eeaf77091939d546e3406bbeade9d3f43bf3a3]
# 
# patch "conf/machine/include/tune-iwmmxt.conf"
#  from [f84662c34e9e89d8d6c662ca1ca187771856446b]
#    to [044cef05873b948668e3cfe0ebd6e3c5bc9304cc]
# 
# patch "conf/machine/magician.conf"
#  from [a773617825e43264669840043d3ee1f792c85b87]
#    to [b3b80b8135ecc0be91d5358d3741876e99fd64b3]
# 
# patch "packages/angstrom/task-angstrom-x11.bb"
#  from [b1c41d2981eed1c0f0883813680b7016a29a156c]
#    to [da68236a6aac84419466b4c471f3439f5c175112]
# 
# patch "packages/base-files/base-files/hx4700/fstab"
#  from [1e2e6279261f31ec833759239ebaf2d76bfc0c46]
#    to [a4d5b1bba05aac824c66ad0061894d289f4a8aaf]
# 
# patch "packages/bluez/bluez-utils_3.1.bb"
#  from [15b0b1a9611f9fe230c10e16d98ab72b9b2dbe66]
#    to [6e23c5824e702fbbaab762244716ebfd9bcdcc4b]
# 
# patch "packages/gaim/gaim_svn.bb"
#  from [9cc0bdfdbecfd8ba7c81ffc5c58fc9dcb81bc9bf]
#    to [82900143606786c056f085e294eb61048b776287]
# 
# patch "packages/gpe-nmf/gpe-nmf_0.22.bb"
#  from [6abf077c420ac2f111298e50c9f1fc2cccf56a47]
#    to [df8fab2a10819e77ca3c1702823943fb4ef15de5]
# 
# patch "packages/gpe-session-scripts/gpe-session-scripts_0.67.bb"
#  from [ba63a0cc2dcaba9a9be7e6a3963f86e5a7725720]
#    to [3493fa2daf7142bc30d45c34fd03a8707cdca83a]
# 
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
#  from [6dc75609908c6c4c3d7e87c6c58a110fbf5683e8]
#    to [a63359836d265ed76ddcb4ba064a879d4174dcb1]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.16/ipaq-pxa270/defconfig"
#  from [e641ffc9d11e811e47c46a599b93e5d62b833aa0]
#    to [4cbe67594804cf76f9bfa7f594495dd564796cd4]
# 
# patch "packages/linux/linux-handhelds-2.6-2.6.18/hx4700/defconfig"
#  from [a5911f55bee2c6d0c9ce43f8ffcbc48be02abde2]
#    to [d231bdefff4012e4637e1ebad836802cc344179e]
# 
# patch "packages/sysvinit/sysvinit/rcS"
#  from [9b2f1189d31ec6bd1a32ba6076552f6027555196]
#    to [05626714ab94be2c0b4171a09caacacc850ff4ce]
# 
# patch "packages/sysvinit/sysvinit/rcS-default"
#  from [d2d687e56bf4b356c7ced68d9a91084cbf03eff2]
#    to [f3a32740870e260855987f3931730eaaeef9f456]
# 
# patch "packages/tasks/task-base.bb"
#  from [5d2a10da7bbd000ddda3ee1adfc278b2cb01ce0f]
#    to [66dc80b2bad2161c0e09570c29305c3c305aeba8]
# 
# patch "packages/tasks/task-gpe.bb"
#  from [7138ac4426bbccbd6ef66ac71fd3825a8d242f34]
#    to [85cb3de4647c813b10d2c7c83f989c40f7e8160a]
# 
# patch "packages/udev/files/mount.sh"
#  from [e9881d2c39ea15422aeb552e6916c546745f8421]
#    to [c26e06d27f97810ae99a90ffe83d00386dcbdfe3]
# 
# patch "packages/udev/udev_100.bb"
#  from [f80b199bde9de8d97823e6198df7a9542bf1244e]
#    to [676ea5a477914c4e3a45f4c074309b9661e49270]
# 
# patch "packages/util-linux/util-linux.inc"
#  from [1082c797febc736bf47e8e054e7557c188cf78d1]
#    to [4f681bad459ec13fba9cd3ce22ef1ae45ece961f]
# 
# patch "packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb"
#  from [70440039c22c6b7d1562d9fac60d8e1f411da444]
#    to [4d7f47ef064a512ef7b49c13a5d1c4b98d9299b6]
# 
# patch "packages/xorg-xserver/xserver-kdrive_git.bb"
#  from [5fa456b8d1e2fc916f224a36834284ee24a4509b]
#    to [50058c997e86a408eee429c8a1419e60a504591e]
# 
============================================================
--- packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch	f56c5b7eff4aff6f73c6b6a0abf25087d013acd3
+++ packages/gpe-session-scripts/files/gpe-bluetooth-optional.patch	f56c5b7eff4aff6f73c6b6a0abf25087d013acd3
@@ -0,0 +1,11 @@
+--- gpe-session-scripts-0.67/gpe-auto-bluetooth.sh.orig	2006-08-31 10:12:25.000000000 +0200
++++ gpe-session-scripts-0.67/gpe-auto-bluetooth.sh	2006-08-31 10:14:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ # start gpe-bluetooth if hardware is built in
+-if [ -f /etc/sysconfig/bluetooth ]; then
++if [ -f /etc/sysconfig/bluetooth -a -x /usr/bin/gpe-bluetooth ]; then
+   . /etc/sysconfig/bluetooth
+   if [ "$BLUETOOTH" = "yes" ]; then
+     exec gpe-bluetooth
============================================================
--- packages/libxslt/libxslt_1.1.15.bb	3ca098fc11b52d22e011e9adeac31ce395dfa57f
+++ packages/libxslt/libxslt_1.1.15.bb	3ca098fc11b52d22e011e9adeac31ce395dfa57f
@@ -0,0 +1,45 @@
+PR = "r0"
+DESCRIPTION = "GNOME XSLT library"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Chris Larson <kergoth at handhelds.org>"
+DEPENDS = "libxml2"
+LICENSE = "MIT"
+PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dev += "${bindir}/xslt-config"
+FILES_${PN}-utils += "${bindir}"
+
+SRC_URI = "ftp://xmlsoft.org/libxslt/libxslt-${PV}.tar.gz"
+S = "${WORKDIR}/libxslt-${PV}"
+
+inherit autotools pkgconfig 
+
+EXTRA_OECONF = "--without-python --without-debug --without-mem-debug"
+
+xsltheaders = "attributes.h documents.h extensions.h extra.h functions.h imports.h \
+               keys.h namespaces.h numbersInternals.h pattern.h preproc.h security.h \
+               templates.h transform.h variables.h xslt.h xsltInternals.h xsltconfig.h \
+               xsltexports.h xsltutils.h"
+exsltheaders = "exslt.h exsltconfig.h exsltexports.h"
+
+do_stage () {
+	oe_libinstall -C libxslt -so -a libxslt ${STAGING_LIBDIR}
+	oe_libinstall -C libexslt -so -a libexslt ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/libxslt
+	for i in ${xsltheaders}; do
+		install -m 0644 ${S}/libxslt/$i ${STAGING_INCDIR}/libxslt/$i
+	done
+	mkdir -p ${STAGING_INCDIR}/libexslt
+	for i in ${exsltheaders}; do
+		install -m 0644 ${S}/libexslt/$i ${STAGING_INCDIR}/libexslt/$i
+	done
+
+	cat xslt-config | sed -e "s,^prefix=.*,prefix=${STAGING_BINDIR}/..," \
+		       	     -e "s,^exec_prefix=.*,exec_prefix=${STAGING_BINDIR}/..," \
+			     -e "s,^includedir=.*,includedir=${STAGING_INCDIR}," \
+			     -e "s,^libdir=.*,libdir=${STAGING_LIBDIR}," > ${STAGING_BINDIR}/xslt-config
+	chmod a+rx ${STAGING_BINDIR}/xslt-config
+	install -m 0644 libxslt.m4 ${STAGING_DATADIR}/aclocal/
+}
============================================================
--- packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb	e5901d5b84f2d955c2910a7a9332a8821fb2499c
+++ packages/module-init-tools/module-init-tools-cross_3.2.2+3.3-pre1.bb	e5901d5b84f2d955c2910a7a9332a8821fb2499c
@@ -0,0 +1,16 @@
+LICENSE = "GPL"
+require module-init-tools_${PV}.bb
+inherit cross
+DEFAULT_PREFERENCE = "1"
+PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
+
+EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}"
+
+do_stage () {
+        oe_runmake install
+        mv ${bindir}/${TARGET_PREFIX}depmod ${bindir}/${TARGET_PREFIX}depmod-2.6
+}
+
+do_install () {
+        :
+}
============================================================
--- packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb	38da0ab69740d0f6b33962776d5a77285ac2e331
+++ packages/module-init-tools/module-init-tools_3.2.2+3.3-pre1.bb	38da0ab69740d0f6b33962776d5a77285ac2e331
@@ -0,0 +1,65 @@
+DESCRIPTION = "This package contains a set of programs for loading, inserting, and \
+removing kernel modules for Linux (versions 2.5.48 and above). It serves \
+the same function that the modutils package serves for Linux 2.4."
+LICENSE = "GPL"
+SECTION = "base"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
+RDEPENDS_${PN} += "module-init-tools-depmod"
+
+FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
+FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-3.3-pre1.tar.bz2 \
+	   file://ignore_arch_directory;patch=1 \
+	   file://modutils_extension;patch=1 \
+	   file://no_man_rebuild;patch=1 \
+	   file://manpagesopt;patch=1 "
+S = "${WORKDIR}/module-init-tools-3.3-pre1"
+
+EXTRA_OECONF = "--disable-manpages"
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+inherit autotools
+
+do_install() {
+	autotools_do_install
+	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
+		mv ${D}/$f ${D}/$f.26
+	done
+}
+
+pkg_postinst_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --install /$f $bn /$f.26 60
+done
+update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
+update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
+}
+
+pkg_prerm_module-init-tools() {
+#!/bin/sh
+for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
+bn=`basename $f`
+   update-alternatives --remove $bn /$f.26
+done
+update-alternatives --remove bin-lsmod /bin/lsmod.26
+update-alternatives --remove lsmod /bin/lsmod.26
+}
+
+pkg_postinst_module-init-tools-depmod() {
+#!/bin/sh
+update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
+}
+
+pkg_prerm_module-init-tools-depmod() {
+#!/bin/sh
+update-alternatives --remove depmod /sbin/depmod.26
+}
============================================================
--- packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch	f0c10b6604d008165119cb855f9aa38457340c57
+++ packages/openswan/openswan-2.4.4/ld-library-path-breakage.patch	f0c10b6604d008165119cb855f9aa38457340c57
@@ -0,0 +1,26 @@
+--- openswan-2.2.0.orig/programs/Makefile.program	2004-06-03 03:06:27.000000000 +0200
++++ openswan-2.2.0/programs/Makefile.program	2005-03-05 13:50:19.000000000 +0100
+@@ -30,10 +30,6 @@
+ 
+ CFLAGS+= ${WERROR}
+ 
+-ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
+-endif
+-
+ MANDIR8=$(MANTREE)/man8
+ MANDIR5=$(MANTREE)/man5
+ 
+--- openswan-2.2.0.orig/programs/pluto/Makefile	2005-01-03 20:40:45.000000000 +0100
++++ openswan-2.2.0/programs/pluto/Makefile	2005-03-05 13:51:21.000000000 +0100
+@@ -234,10 +234,6 @@
+ LIBSPLUTO+=${CURL_LIBS} 
+ LIBSPLUTO+= -lgmp -lresolv # -lefence
+ 
+-ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
+-endif
+-
+ LIBSADNS = $(OPENSWANLIB)
+ LIBSADNS += -lresolv # -lefence
+ 
============================================================
--- packages/openswan/openswan_2.4.4.bb	0edced32fce642ee16a5bd7ddf1953661f68ac02
+++ packages/openswan/openswan_2.4.4.bb	0edced32fce642ee16a5bd7ddf1953661f68ac02
@@ -0,0 +1,33 @@
+SECTION = "console/network"
+DESCRIPTION = "Openswan is an Open Source implementation of IPsec for the \
+Linux operating system."
+HOMEPAGE = "http://www.openswan.org"
+LICENSE = "GPLv2"
+DEPENDS = "gmp flex-native"
+RRECOMMENDS = "kernel-module-ipsec"
+RDEPENDS_nylon = "perl"
+PR = "r0"
+
+SRC_URI = "http://www.openswan.org/download/openswan-${PV}.tar.gz \
+	   file://ld-library-path-breakage.patch;patch=1"
+S = "${WORKDIR}/openswan-${PV}"
+
+PARALLEL_MAKE = ""
+EXTRA_OEMAKE = "DESTDIR=${D} \
+                USERCOMPILE="${CFLAGS}" \
+                FINALCONFDIR=${sysconfdir}/ipsec \
+                INC_RCDEFAULT=${sysconfdir}/init.d \
+                INC_USRLOCAL=${prefix} \
+                INC_MANDIR=share/man WERROR=''"
+
+do_compile () {
+	oe_runmake programs
+}
+
+do_install () {
+	oe_runmake install
+}
+
+FILES_${PN} += "${libdir}/ipsec/"
+
+CONFFILES_${PN} = "${sysconfdir}/ipsec/ipsec.conf"
============================================================
--- packages/poweroffkey/poweroffkey_0.1.bb	39a44f1357326a6bb1745cf16a9a852b487ef248
+++ packages/poweroffkey/poweroffkey_0.1.bb	39a44f1357326a6bb1745cf16a9a852b487ef248
@@ -0,0 +1,9 @@
+LICENSE = "PD"
+inherit gpe
+
+DESCRIPTION = "power off key hack"
+
+SECTION = "base"
+PRIORITY = "optional"
+
+SRC_URI="file:///home/ph5/src/hx4700/${PN}-${PV}.tar.gz"
============================================================
--- packages/snes9x/snes9x/configure-sizeof-void-int.patch	4636c02afb0c23f8e64115d5fb60b2477b24a317
+++ packages/snes9x/snes9x/configure-sizeof-void-int.patch	4636c02afb0c23f8e64115d5fb60b2477b24a317
@@ -0,0 +1,23 @@
+--- snes9x-1.5-src/configure.in.orig	2006-08-04 16:27:35.693980458 +0200
++++ snes9x-1.5-src/configure.in	2006-08-04 16:28:11.704193040 +0200
+@@ -655,20 +655,6 @@
+ fi
+ ])
+ 
+-AC_MSG_CHECKING(if sizeof(void *) == sizeof(int))
+-AC_TRY_RUN([
+-  int main()
+-  {
+-   return(!(sizeof(void *) == sizeof(int)));
+-  }
+-], snes9x_ptr_is_int=yes)
+-if test x$snes9x_ptr_is_int = xyes; then
+-  AC_MSG_RESULT(yes)
+-else
+-  AC_MSG_RESULT(no)
+-  SYSDEFINES="$SYSDEFINES -DPTR_NOT_INT"
+-fi
+-
+ AC_MY_CHECK_SAR(int8)
+ AC_MY_CHECK_SAR(int16)
+ AC_MY_CHECK_SAR(int32)
============================================================
--- packages/snes9x/snes9x/makefile-1.5.patch	1096953a70a69d90765d9ba53906883b187224cb
+++ packages/snes9x/snes9x/makefile-1.5.patch	1096953a70a69d90765d9ba53906883b187224cb
@@ -0,0 +1,39 @@
+--- snes9x-1.5-src/Makefile.in.orig	2006-08-04 16:50:34.310687060 +0200
++++ snes9x-1.5-src/Makefile.in	2006-08-04 16:54:22.216690330 +0200
+@@ -187,7 +187,7 @@
+ OPTIMISE=-O4 -ffreestanding -ffast-math -fschedule-insns2 -fomit-frame-pointer -fno-inline-functions -fno-defer-pop -fforce-addr -fstrict-aliasing -funroll-loops -fdelete-null-pointer-checks -fno-exceptions
+ CPUFLAGS=-ml  -m4-single-only
+ else
+-OPTIMISE = @OPTIMIZE@
++OPTIMISE = $(filter-out @OPTIMIZE@,-pedantic)
+ endif
+ 
+ DEFS += \
+@@ -207,7 +207,7 @@
+ $(SDD1DEFINES) \
+ $(CORRVRAMDEFINES) \
+ $(JOYDEFINES) \
+--DNO_INLINE_SET_GET @SYSDEFINES@
++-DNO_INLINE_SET_GET @SYSDEFINES@ $(OECFLAGS)
+ 
+ CCFLAGS = $(OPTIMISE) $(CPUFLAGS) $(INCLUDES) $(DEFS)
+ 
+@@ -245,15 +245,15 @@
+ OFFSET=
+ endif
+ 
+-offsets: offsets.o
+-	$(CCC) $(INCLUDES) -o $@ offsets.o
++offsets: offsets.cpp
++	$(BUILD_CXX) $(INCLUDES) -o $@ $<
+ 	./offsets >$(CPU)/offsets.h
+ 
+ #../zlib/libz.a:
+ #	cd ../zlib && sh ./configure && make
+ 
+ snes9x: $(OBJECTS) unix/x11.o $(AIDOOBJS) $(OFFSET)
+-	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm
++	$(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(AIDOOBJS) $(GLIDEOBJS) $(OPENGLOBJS) unix/x11.o $(OELDFLAGS) $(LDLIBS) $(GLIDELIBS) $(OPENGLLIBS) @SYSLIBS@ -lXext -lX11 $(EXTRALIBS) -lm
+ 
+ unix/svga_keynames.h: unix/svga_get_keynames.pl
+ 	unix/svga_get_keynames.pl /usr/include/vgakeyboard.h > unix/svga_keynames.h
============================================================
--- packages/snes9x/snes9x_1.5.bb	6ab62b55bd3ac5b61f0498545512697acec0f933
+++ packages/snes9x/snes9x_1.5.bb	6ab62b55bd3ac5b61f049854%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list