diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-01-03 14:31:37 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-01-03 14:31:44 -0600 |
| commit | 9b70352c2224bab37b0ea71bfea8ef7b2250d9b7 (patch) | |
| tree | c5d6420b512e445a69a5bf9d6a895ae7eea2ab41 /package/parted | |
| parent | a632106ba3ef1d670cb78e5107cb6a03fbbc675d (diff) | |
allow static build of nfsroot for lemote
Diffstat (limited to 'package/parted')
| -rw-r--r-- | package/parted/Makefile | 27 | ||||
| -rw-r--r-- | package/parted/patches/patch-lib_config_h_in | 10 |
2 files changed, 23 insertions, 14 deletions
diff --git a/package/parted/Makefile b/package/parted/Makefile index aeb8163cf..1087ec9b5 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -9,26 +9,35 @@ PKG_RELEASE:= 1 PKG_HASH:= 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 PKG_DESCR:= partition table editor PKG_SECTION:= sys/fs -PKG_DEPENDS:= libblkid libuuid libreadline libpthread -PKG_DEPENDS+= libdevmapper -PKG_BUILDDEP:= util-linux readline lvm +PKG_DEPENDS:= libblkid libuuid libpthread +PKG_BUILDDEP:= util-linux PKG_URL:= http://www.gnu.org/software/parted/index.shtml -PKG_SITES:= ${MASTER_SITE_GNU:=parted/} +PKG_SITES:= $(MASTER_SITE_GNU:=parted/) PKG_BUILDDEP_UCLIBC:= libiconv-tiny PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + ifeq ($(ADK_TARGET_LIB_UCLIBC)$(ADK_TARGET_LIB_UCLIBC_NG),y) TARGET_LDFLAGS+= -liconv endif -$(eval $(call PKG_template,PARTED,parted,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS),y) +CONFIGURE_ARGS+= --disable-dynamic-loading +endif + +CONFIGURE_ARGS+= --disable-device-mapper \ + --without-readline parted-install: - ${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib - ${CP} $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib - ${INSTALL_BIN} $(WRKINST)/usr/sbin/parted $(IDIR_PARTED)/usr/sbin +ifneq ($(ADK_TARGET_USE_STATIC_LIBS),y) + $(INSTALL_DIR) $(IDIR_PARTED)/usr/lib + $(CP) $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib +endif + $(INSTALL_DIR) $(IDIR_PARTED)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/parted $(IDIR_PARTED)/usr/sbin -include ${ADK_TOPDIR}/mk/pkg-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/parted/patches/patch-lib_config_h_in b/package/parted/patches/patch-lib_config_h_in index df6cb1f7d..44c07bbc6 100644 --- a/package/parted/patches/patch-lib_config_h_in +++ b/package/parted/patches/patch-lib_config_h_in @@ -1,8 +1,8 @@ ---- parted-3.1.orig/lib/config.h.in 2012-03-02 17:10:29.000000000 +0100 -+++ parted-3.1/lib/config.h.in 2013-12-25 20:03:47.000000000 +0100 -@@ -1424,6 +1424,11 @@ - # define _DARWIN_USE_64_BIT_INODE 1 - #endif +--- parted-3.2.orig/lib/config.h.in 2014-07-28 22:02:54.000000000 -0500 ++++ parted-3.2/lib/config.h.in 2015-01-03 14:02:11.888853421 -0600 +@@ -1471,6 +1471,11 @@ + /* Enable large inode numbers on Mac OS X 10.5. */ + #undef _DARWIN_USE_64_BIT_INODE +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE |