allow static build of nfsroot for lemote

1 files changed, 43 insertions, 36 deletions

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 2b0697f64..976bb3e51 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		e2fsprogs
 PKG_VERSION:=		1.42.10
@@ -12,11 +12,11 @@ PKG_SECTION:=		sys/fs
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		util-linux
 PKG_URL:=		http://e2fsprogs.sourceforge.net/
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
+PKG_SITES:=		$(MASTER_SITE_SOURCEFORGE:=e2fsprogs/)
 PKG_OPTS:=		dev
 PKG_NOPARALLEL:=	1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		LIBE2FS LIBCOM_ERR LIBSS
 PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
@@ -39,64 +39,71 @@ PKGSD_MKE2FS:=		ext2/3/4 filesystem creation utility
 PKGSC_MKE2FS:=		sys/fs
 PKGSS_MKE2FS:=		libe2fs libcom-err libblkid libuuid libncurses
 
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
-$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
-$(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
-$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
-$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
-$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
-$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
+$(eval $(call PKG_template,LIBE2FS,libe2fs,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBE2FS),$(PKGSC_LIBE2FS),$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBCOM_ERR,libcom-err,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBCOM_ERR),$(PKGSC_LIBCOM_ERR),$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBSS,libss,$(PKG_VERSION)-$(PKG_RELEASE),,$(PKGSD_LIBSS),$(PKGSC_LIBSS),$(PKG_OPTS)))
+$(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_TUNE2FS),$(PKGSD_TUNE2FS),$(PKGSC_TUNE2FS)))
+$(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS)))
+$(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS)))
+$(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK)))
 
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y)
+CONFIGURE_ARGS+=	--disable-elf-shlibs \
+			--enable-libblkid
+else
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
-			--disable-rpath \
+			--disable-libblkid 
+endif
+
+CONFIGURE_ARGS+=	--disable-rpath \
 			--disable-libuuid \
-			--disable-libblkid \
+			--disable-testio-debug \
 			--disable-debugfs \
 			--disable-defrag
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_TARGET_DIR)/usr/include
-MAKE_FLAGS+=		BUILD_CC="${HOST_CC}" \
-			BUILD_CFLAGS="${HOST_CFLAGS} ${HOST_CPPFLAGS} -I${WRKSRC}/lib -I." \
-			BUILD_LDFLAGS="${HOST_LDFLAGS}"
+MAKE_FLAGS+=		BUILD_CC="$(HOST_CC)" \
+			BUILD_CFLAGS="$(HOST_CFLAGS) $(HOST_CPPFLAGS) -I$(WRKSRC)/lib -I." \
+			BUILD_LDFLAGS="$(HOST_LDFLAGS)"
 
 libe2fs-install:
-	${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
-	${INSTALL_DATA} ${WRKBUILD}/misc/mke2fs.conf ${IDIR_LIBE2FS}/etc
-	${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
-		${IDIR_LIBE2FS}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBE2FS)/etc
+	$(INSTALL_DATA) $(WRKBUILD)/misc/mke2fs.conf $(IDIR_LIBE2FS)/etc
+	$(INSTALL_DIR) $(IDIR_LIBE2FS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/lib(e2p,ext2fs).so.* \
+		$(IDIR_LIBE2FS)/usr/lib
 
 e2fsck-install:
-	${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_E2FSCK)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/e2fsck $(IDIR_E2FSCK)/usr/sbin
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext3
 	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext4
 
 mke2fs-install:
-	${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_MKE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/mke2fs $(IDIR_MKE2FS)/usr/sbin
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext2
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext3
 	cd $(IDIR_MKE2FS)/usr/sbin && ln -sf mke2fs mkfs.ext4
 
 tune2fs-install:
-	${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_TUNE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/tune2fs $(IDIR_TUNE2FS)/usr/sbin
 
 resize2fs-install:
-	${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin
+	$(INSTALL_DIR) $(IDIR_RESIZE2FS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/resize2fs $(IDIR_RESIZE2FS)/usr/sbin
 
 libcom-err-install:
-	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcom_err.so* \
-		${IDIR_LIBCOM_ERR}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBCOM_ERR)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcom_err.so* \
+		$(IDIR_LIBCOM_ERR)/usr/lib
 
 libss-install:
-	${INSTALL_DIR} ${IDIR_LIBSS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libss.so* \
-		${IDIR_LIBSS}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBSS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libss.so* \
+		$(IDIR_LIBSS)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk