libnfsidmap:

 * cleanup Makefile
 * fix compile
 * refresh patch using quilt

SVN-Revision: 7935

diff --git a/libs/libnfsidmap/Makefile b/libs/libnfsidmap/Makefile
index af5ca7a057770e7d7aae57c473bf10d5e7624229..3ff78d4d513829e43343a481d1073b45d080e33b 100644 (file)
--- a/libs/libnfsidmap/Makefile
+++ b/libs/libnfsidmap/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libnfsidmap
 PKG_VERSION:=0.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
@@ -27,28 +27,26 @@ define Package/libnfsidmap
 endef
 
 TARGET_CFLAGS += -I$(PKG_BUILD_DIR)/lib
-define Build/Compile
-       $(call Build/Compile/Default, \
-               OPT="$(TARGET_CFLAGS)" \
-               INSTALLSUID="install -m 4755" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install \
-       )
-endef
+
+MAKE_FLAGS += \
+       OPT="$(TARGET_CFLAGS)" \
+       INSTALLSUID="install -m 4755" \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/nfsidmap.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnfsidmap.{a,so*} $(STAGING_DIR)/usr/lib
-       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+       $(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnfsidmap.pc $(STAGING_DIR)/usr/lib/pkgconfig
 endef  
 
 define Build/UninstallDev
        rm -rf \
-               $(STAGING_DIR)/usr/include/nfsidmap.h
-               $(STAGING_DIR)/usr/lib/libnfsidmap.{a,so*}
+               $(STAGING_DIR)/usr/include/nfsidmap.h \
+               $(STAGING_DIR)/usr/lib/libnfsidmap.{a,so*} \
                $(STAGING_DIR)/usr/lib/pkgconfig/libnfsidmap.pc
 endef
 

diff --git a/libs/libnfsidmap/patches/000-no-getgrouplist.patch b/libs/libnfsidmap/patches/000-no-getgrouplist.patch
index 3f5a6175020be65ecce1ca7687bb6da2f92b5c29..ea48245a426c21f1948efc324cca2a7a0899a3ce 100644 (file)
--- a/libs/libnfsidmap/patches/000-no-getgrouplist.patch
+++ b/libs/libnfsidmap/patches/000-no-getgrouplist.patch
@@ -1,5 +1,7 @@
---- libnfsidmap-0.20/nss.c~    2007-02-05 08:13:05.000000000 -0800
-+++ libnfsidmap-0.20/nss.c     2007-06-07 15:18:45.000000000 -0700
+Index: libnfsidmap-0.20/nss.c
+===================================================================
+--- libnfsidmap-0.20.orig/nss.c        2007-07-12 11:42:09.000000000 +0200
++++ libnfsidmap-0.20/nss.c     2007-07-12 11:42:09.000000000 +0200
 @@ -295,9 +295,9 @@
                ret = -ENOENT;
                goto out;