diff --git a/repos/ports/recipes/src/e2fsprogs-minimal/content.mk b/repos/ports/recipes/src/e2fsprogs-minimal/content.mk new file mode 100644 index 000000000..18dfb956b --- /dev/null +++ b/repos/ports/recipes/src/e2fsprogs-minimal/content.mk @@ -0,0 +1,9 @@ +# keep 'e2fsprogs/target.inc' but not 'e2fsprogs/target.mk' +E2FSPROGS_SRC := src/noux-pkg/e2fsprogs/target.inc + +include $(REP_DIR)/recipes/src/e2fsprogs/content.mk + +content: src/noux-pkg/e2fsprogs-minimal + +src/noux-pkg/e2fsprogs-minimal: + $(mirror_from_rep_dir) diff --git a/repos/ports/recipes/src/e2fsprogs-minimal/hash b/repos/ports/recipes/src/e2fsprogs-minimal/hash new file mode 100644 index 000000000..59ce14114 --- /dev/null +++ b/repos/ports/recipes/src/e2fsprogs-minimal/hash @@ -0,0 +1 @@ +2018-02-14 de4fcd36004199209df12ae694fe9173c63ad38b diff --git a/repos/ports/recipes/src/e2fsprogs-minimal/used_apis b/repos/ports/recipes/src/e2fsprogs-minimal/used_apis new file mode 100644 index 000000000..737e3c26a --- /dev/null +++ b/repos/ports/recipes/src/e2fsprogs-minimal/used_apis @@ -0,0 +1,3 @@ +libc +noux +posix diff --git a/repos/ports/recipes/src/e2fsprogs/content.mk b/repos/ports/recipes/src/e2fsprogs/content.mk index 9fc9b73db..4ea98a318 100644 --- a/repos/ports/recipes/src/e2fsprogs/content.mk +++ b/repos/ports/recipes/src/e2fsprogs/content.mk @@ -1,3 +1,5 @@ +E2FSPROGS_SRC ?= $(addprefix src/noux-pkg/e2fsprogs/,target.inc target.mk) + content: src/noux-pkg/e2fsprogs LICENSE PORT_DIR := $(call port_dir,$(REP_DIR)/ports/e2fsprogs) @@ -5,7 +7,7 @@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/e2fsprogs) src/noux-pkg/e2fsprogs: mkdir -p $@ cp -a $(PORT_DIR)/src/noux-pkg/e2fsprogs/* $@ - cp -a $(REP_DIR)/src/noux-pkg/e2fsprogs/* $@ + cp -a $(addprefix $(REP_DIR)/,$(E2FSPROGS_SRC)) $@ LICENSE: cp $(PORT_DIR)/src/noux-pkg/e2fsprogs/COPYING $@ diff --git a/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk b/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk new file mode 100644 index 000000000..ac4e5dd65 --- /dev/null +++ b/repos/ports/src/noux-pkg/e2fsprogs-minimal/target.mk @@ -0,0 +1,7 @@ +BINARIES := fsck.ext2 mkfs.ext2 + +INSTALL_TAR_CONTENT := $(addprefix bin/,$(BINARIES)) + +PKG_DIR = $(call select_from_ports,e2fsprogs)/src/noux-pkg/e2fsprogs + +include $(REP_DIR)/src/noux-pkg/e2fsprogs/target.inc diff --git a/repos/ports/src/noux-pkg/e2fsprogs/target.inc b/repos/ports/src/noux-pkg/e2fsprogs/target.inc new file mode 100644 index 000000000..c301a3f9d --- /dev/null +++ b/repos/ports/src/noux-pkg/e2fsprogs/target.inc @@ -0,0 +1,11 @@ +CONFIGURE_FLAGS = --disable-tls --enable-fsck + +# NOTE: --sbindir=/bin is broken and the easist fix is patching configure +# directly and therefore is not used. + +# +# Needed for +# +CFLAGS += -D__BSD_VISIBLE + +include $(call select_from_repositories,mk/noux.mk) diff --git a/repos/ports/src/noux-pkg/e2fsprogs/target.mk b/repos/ports/src/noux-pkg/e2fsprogs/target.mk index c301a3f9d..310689bf0 100644 --- a/repos/ports/src/noux-pkg/e2fsprogs/target.mk +++ b/repos/ports/src/noux-pkg/e2fsprogs/target.mk @@ -1,11 +1 @@ -CONFIGURE_FLAGS = --disable-tls --enable-fsck - -# NOTE: --sbindir=/bin is broken and the easist fix is patching configure -# directly and therefore is not used. - -# -# Needed for -# -CFLAGS += -D__BSD_VISIBLE - -include $(call select_from_repositories,mk/noux.mk) +include $(PRG_DIR)/target.inc