[oe-commits] Khem Raj : quota: Replace using -I= with STAGING_INCDIR

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5ad4131421193eab1f78ab42ada13977168f7973
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5ad4131421193eab1f78ab42ada13977168f7973

Author: Khem Raj <raj.khem at gmail.com>
Date:   Sat Sep 12 17:08:28 2015 +0000

quota: Replace using -I= with STAGING_INCDIR

-I= is gcc specific, using STAGING_INCDIR makes it compiler independent
Update posix types patch to include new u_int -> uint32_t changes

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 .../quota/quota/remove_non_posix_types.patch                | 13 +++++++++++++
 meta/recipes-extended/quota/quota_4.02.bb                   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
index 5442d98..06ff13c 100644
--- a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
+++ b/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
@@ -183,3 +183,16 @@ Index: quota-tools/quot.h
  } du_t;
  
  #define	NDU	60000
+Index: quota-tools/rquota_server.c
+===================================================================
+--- quota-tools.orig/rquota_server.c
++++ quota-tools/rquota_server.c
+@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX];
+  */
+ extern struct authunix_parms *unix_cred;
+ 
+-int in_group(gid_t * gids, u_int len, gid_t gid)
++int in_group(gid_t * gids, uint32_t len, gid_t gid)
+ {
+ 	gid_t *gidsp = gids + len;
+ 
diff --git a/meta/recipes-extended/quota/quota_4.02.bb b/meta/recipes-extended/quota/quota_4.02.bb
index 124b0a3..673d584 100644
--- a/meta/recipes-extended/quota/quota_4.02.bb
+++ b/meta/recipes-extended/quota/quota_4.02.bb
@@ -23,7 +23,7 @@ DEPENDS = "gettext-native e2fsprogs"
 
 inherit autotools-brokensep gettext pkgconfig
 
-CFLAGS += "-I=${includedir}/tirpc"
+CFLAGS += "-I${STAGING_INCDIR}/tirpc"
 LDFLAGS += "-ltirpc"
 ASNEEDED = ""
 EXTRA_OEMAKE += 'STRIP=""'