From 8969768dbefea80c341407c3dec12faab19c42f0 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 18 Jan 2006 11:03:21 +0000 Subject: gpe-bluetooth_0.49.bb : add libcontactsdb to the DEPENDS --- packages/gpe-bluetooth/gpe-bluetooth_0.49.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb index dc891e7598..6186c70679 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb @@ -4,7 +4,7 @@ SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Florian Boor " -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus libcontactsdb" RDEPENDS = "bluez-utils-dbus blueprobe" GPE_TARBALL_SUFFIX= "bz2" -- cgit v1.2.3 From 7806f7d8b13482006a8bb929756b48f222f75386 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 18 Jan 2006 11:22:09 +0000 Subject: libxsettings-client_0.16.bb : fix a problem with include paths * Makefile.am contained a -I$(includedir) which is bogus and has now been patched out. This prevented building on my X86_64 machine. --- .../libxsettings-client-0.16/.mtn2git_empty | 0 .../libxsettings-client-0.16/Makefile-am.patch | 11 +++++++++++ packages/libxsettings-client/libxsettings-client_0.16.bb | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty create mode 100644 packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch diff --git a/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty b/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch new file mode 100644 index 0000000000..fb5b1dbe65 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch @@ -0,0 +1,11 @@ +--- libxsettings-client-0.16/Makefile.am.orig 2006-01-17 16:01:21.000000000 +0000 ++++ libxsettings-client-0.16/Makefile.am 2006-01-17 16:01:30.000000000 +0000 +@@ -3,7 +3,7 @@ + source_h = xsettings-client.h xsettings-common.h + source_c = xsettings-client.c xsettings-common.c + +-INCLUDES = -I $(includedir) $(X_CFLAGS) ++INCLUDES = $(X_CFLAGS) + + libxsincludedir = $(includedir) + diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 5f5d618695..0e54f6088b 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -3,10 +3,12 @@ LICENSE = "BSD-X" PRIORITY = "optional" DEPENDS = "libxsettings x11" MAINTAINER = "Florian Boor " +PR="r1" inherit autotools pkgconfig gpe -SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2" +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ + file://Makefile-am.patch;patch=1" headers = "xsettings-client.h xsettings-common.h" -- cgit v1.2.3 From c3a20dc277a3913df8c25ce50997d3ccccc2f448 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 18 Jan 2006 11:25:43 +0000 Subject: ppp_2.4.3.bb : Makefile references /usr/lib /usr/include directly. * Patched out the checks the Makefile does for /usr/include/crypt.h and /usr/include/libcrypt.* as this is broken in cross compile and these files should always exist and be used for an OE generated libc. These bogus checks prevented compiling on X86_64 --- .../makefile-remove-hard-usr-reference.patch | 19 +++++++++++++++++++ packages/ppp/ppp_2.4.3.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch diff --git a/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch new file mode 100644 index 0000000000..574abfaf2c --- /dev/null +++ b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch @@ -0,0 +1,19 @@ +--- ppp-2.4.3/pppd/Makefile.linux.orig 2006-01-17 15:09:56.000000000 +0000 ++++ ppp-2.4.3/pppd/Makefile.linux 2006-01-17 15:10:21.000000000 +0000 +@@ -117,12 +117,12 @@ + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++#ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 +-endif +-ifneq ($(wildcard /usr/lib/libcrypt.*),) ++#endif ++#ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt +-endif ++#endif + + ifdef NEEDDES + ifndef USE_CRYPT diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index 8701efc556..0e3b9be24a 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://plugins-fix-CC.patch;patch=1 \ file://pppoatm-makefile.patch;patch=1 \ file://enable-ipv6.patch;patch=1 \ + file://makefile-remove-hard-usr-reference.patch;patch=1 \ file://pon \ file://poff \ file://init \ -- cgit v1.2.3