diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-01-18 11:25:43 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-18 11:25:43 +0000 |
| commit | c3a20dc277a3913df8c25ce50997d3ccccc2f448 (patch) | |
| tree | 7c0a17373b1b0a72fcaf59c4addbb4528c051ac0 /packages | |
| parent | 7806f7d8b13482006a8bb929756b48f222f75386 (diff) | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch | 19 | ||||
| -rw-r--r-- | packages/ppp/ppp_2.4.3.bb | 3 |
2 files changed, 21 insertions, 1 deletions
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 \ |