diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-02-04 16:24:40 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-04 16:24:40 +0000 |
| commit | 92324d6f005511e66b8cfed48b65e1efd46c2c6a (patch) | |
| tree | ac8236af64265868caf0f47cd0718c87d9da3100 | |
| parent | ddf103029fafca8741c10f7514954e9af7306712 (diff) | |
| parent | 38ad5b8d92ad0d03d92e44d63ac05b7ceeee1078 (diff) | |
merge of 606273dce3a98e6ee0f49b8f1b1fd6e0c7589de4
and c9a508bd5e793702701e7c831135d1881474b0fa
| -rw-r--r-- | packages/dbus/dbus/no-static.patch | 22 | ||||
| -rw-r--r-- | packages/wlan-ng/wlan-ng-modules_0.2.2.bb | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/packages/dbus/dbus/no-static.patch b/packages/dbus/dbus/no-static.patch new file mode 100644 index 0000000000..a28a582681 --- /dev/null +++ b/packages/dbus/dbus/no-static.patch @@ -0,0 +1,22 @@ +--- dbus-0.23.4/bus/Makefile.am.old 2006-02-04 11:51:26.000000000 +0000 ++++ dbus-0.23.4/bus/Makefile.am 2006-02-04 11:51:27.000000000 +0000 +@@ -63,7 +63,7 @@ + dbus_daemon_1_LDADD= \ + $(EFENCE) \ + $(DBUS_BUS_LIBS) \ +- $(top_builddir)/dbus/libdbus-convenience.la ++ $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/dbus/libdbus-convenience.la + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to +--- dbus-0.23.4/dbus/Makefile.am.old 2006-02-04 13:27:03.000000000 +0000 ++++ dbus-0.23.4/dbus/Makefile.am 2006-02-04 13:27:04.000000000 +0000 +@@ -144,7 +144,7 @@ + libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) + ## don't export symbols that start with "_" (we use this + ## convention for internal symbols) +-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" ++#libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" + + ## note that TESTS has special meaning (stuff to use in make check) + ## so if adding tests not to be run in make check, don't add them to diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb index e2528a78af..177eb41fd6 100644 --- a/packages/wlan-ng/wlan-ng-modules_0.2.2.bb +++ b/packages/wlan-ng/wlan-ng-modules_0.2.2.bb @@ -6,6 +6,9 @@ RRECOMMENDS = "wlan-ng-utils" LICENSE = "GPL" PR = "r1" +# 0.2.1-pre works with the tosa internal wlan chipset, while 0.2.2 does not :/ +DEFAULT_PREFERENCE_tosa = "-1" + SRC_URI = "ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/linux-wlan-ng-${PV}.tar.bz2 \ file://no-compat.patch;patch=1 \ file://msleep-vs-mdelay.patch;patch=1 \ |