diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-09-30 16:05:02 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-09-30 16:05:02 +0200 |
| commit | 6ff33ca05ecec6178e06d56bc9e2270b369de441 (patch) | |
| tree | fc2596137cfaa4ec61145856369bd3a04545045d | |
| parent | 74d7222aee9f3725adeee1855c862a307b734d0b (diff) | |
| parent | 2bd89915c3ed05864641ec982fe39bc5c6505cca (diff) | |
Merge branch 'org.openembedded.dev' of ssh://git.openembedded.net/openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/proftpd/files/make.patch | 13 | ||||
| -rw-r--r-- | recipes/proftpd/proftpd_1.3.2.bb | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/recipes/proftpd/files/make.patch b/recipes/proftpd/files/make.patch index 66ebf2ce89..3e8109f373 100644 --- a/recipes/proftpd/files/make.patch +++ b/recipes/proftpd/files/make.patch @@ -49,3 +49,16 @@ Index: proftpd-1.3.2/Make.rules.in RM=rm -f SHELL=/bin/sh +Index: proftpd-1.3.2/lib/libcap/Makefile +=================================================================== +--- proftpd-1.3.2.orig/lib/libcap/Makefile ++++ proftpd-1.3.2/lib/libcap/Makefile +@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) + all: $(LIBNAME) + + _makenames: _makenames.c cap_names.sed +- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ ++ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h diff --git a/recipes/proftpd/proftpd_1.3.2.bb b/recipes/proftpd/proftpd_1.3.2.bb index 1a9736dbf3..c051a6328e 100644 --- a/recipes/proftpd/proftpd_1.3.2.bb +++ b/recipes/proftpd/proftpd_1.3.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \ file://make.patch;patch=1 \ |