Change-Id: I292616827359fde95fde313034794e040eb72ad4 Signed-off-by: Dan Cross <[email protected]> --- tools/sys-apps/diffutils/.gitignore | 1 + tools/sys-apps/diffutils/Makefile | 55 ++++++++++++++++++++++ .../akaros-patches/3.3/diffutils-3.3.patch | 26 ++++++++++ 3 files changed, 82 insertions(+) create mode 100644 tools/sys-apps/diffutils/.gitignore create mode 100644 tools/sys-apps/diffutils/Makefile create mode 100644 tools/sys-apps/diffutils/akaros-patches/3.3/diffutils-3.3.patch
diff --git a/tools/sys-apps/diffutils/.gitignore b/tools/sys-apps/diffutils/.gitignore new file mode 100644 index 0000000..1fe6044 --- /dev/null +++ b/tools/sys-apps/diffutils/.gitignore @@ -0,0 +1 @@ +tar-* diff --git a/tools/sys-apps/diffutils/Makefile b/tools/sys-apps/diffutils/Makefile new file mode 100644 index 0000000..21426c6 --- /dev/null +++ b/tools/sys-apps/diffutils/Makefile @@ -0,0 +1,55 @@ +include ../../Makefrag + +########## Package-specific variables +version := 3.3 +src-dir = diffutils-$(version) +build-dir = $(src-dir)/build +tarball = diffutils-$(version).tar.xz +fetch-url = http://ftp.gnu.org/gnu/diffutils/$(tarball) +config-opts = --prefix=/usr \ + --bindir=/bin \ + --disable-nls \ + --host=x86_64-ucb-akaros \ + --build=i686-pc-linux-gnu + +########## Generic Infrastructure + +PHONY := all +all: make + +%.tar.xz: + $(Q)wget $(fetch-url) + +akaros-patches := $(sort $(wildcard akaros-patches/$(version)/*)) + +$(build-dir): $(tarball) $(akaros-patches) + rm -fr $(src-dir) + tar -xf $< + $(Q)mkdir $(build-dir) && \ + for i in $(akaros-patches); do \ + (cd $(src-dir) && patch -p1 < ../$$i); \ + done + +PHONY += config +$(build-dir)/Makefile config: $(build-dir) + cd $(build-dir) && env ../configure $(config-opts) + +PHONY += make +make: config + $(Q)$(MAKE) -C $(build-dir) + +PHONY += install +install: make + $(Q)$(MAKE) -C $(build-dir) install-exec DESTDIR=$(KFS_ROOT) + +PHONY += clean +clean: + $(Q)[ -d $(build-dir) ] && \ + [ -f $(build-dir)/Makefile ] && \ + $(MAKE) -C $(build-dir) clean || true + +PHONY += mrproper +mrproper: + $(Q)rm -rf $(src-dir) + +.PHONY: $(PHONY) diff --git a/tools/sys-apps/diffutils/akaros-patches/3.3/diffutils-3.3.patch b/tools/sys-apps/diffutils/akaros-patches/3.3/diffutils-3.3.patch new file mode 100644 index 0000000..cbd9ebf --- /dev/null +++ b/tools/sys-apps/diffutils/akaros-patches/3.3/diffutils-3.3.patch @@ -0,0 +1,26 @@ +diff -ru diffutils-3.3.dist/build-aux/config.guess diffutils-3.3/build-aux/config.guess +--- diffutils-3.3.dist/build-aux/config.guess 2013-03-22 00:20:48.000000000 -0400 ++++ diffutils-3.3/build-aux/config.guess 2016-05-25 15:26:34.263108318 -0400 +@@ -194,6 +194,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Akaros:*:*) ++ UNAME_MACHINE_ARCH=x86_64 ++ echo x86_64-ucb-akaros1.0 ++ exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} +diff -ru diffutils-3.3.dist/build-aux/config.sub diffutils-3.3/build-aux/config.sub +--- diffutils-3.3.dist/build-aux/config.sub 2013-03-22 00:20:48.000000000 -0400 ++++ diffutils-3.3/build-aux/config.sub 2016-05-25 15:26:21.374757287 -0400 +@@ -1354,7 +1354,7 @@ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* | -aros* \ ++ | -akaros* | -aos* | -aros* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- 2.8.0.rc3.226.g39d4020 -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
