From: Daniel Wagner Date: Fri, 7 Jan 2022 10:14:20 +0000 (+0100) Subject: build: Replacing make by meson. X-Git-Tag: v2.0-rc0~11^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a7811946d9effc030811f9c01776f005b3a0b85;p=users%2Fsagi%2Fnvme-cli.git build: Replacing make by meson. This involves replacing all Makefiles by meson.build files. Also the top-level configure script now simply invokes meson. The top-level Makefile is just a wrapper for meson. It supports the following operations: make make test make install make clean # Remove build artifacts but keep configuration make purge # Remove build artifacts and configuration Based on Martin Belanger's libnvme work. Signed-off-by: Daniel Wagner --- diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml deleted file mode 100644 index 1aa4a774..00000000 --- a/.github/workflows/c-cpp.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: C/C++ CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Checkout libnvme - run: git submodule update --init - - name: make - run: sudo apt-get install libjson-c-dev && make clean && make && make clean - diff --git a/.gitignore b/.gitignore index 62309526..8813043e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,24 +4,13 @@ a.out *.o *~ *.swp -NVME-VERSION-FILE -nvme.spec nvme-*.tar.gz -version - -ccan/config.h -ccan/tools/configurator/configurator subprojects/* !subprojects/*.wrap cscope.* -/debian/files -/debian/nvme-cli.debhelper.log -/debian/nvme-cli.substvars -/debian/nvme-cli - tests/__pycache__ tests/nvmetests tests/*.pyc diff --git a/.gitmodules b/.gitmodules index 2edbe0f5..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "libnvme"] - path = libnvme - url = https://github.com/linux-nvme/libnvme - branch = master diff --git a/Documentation/Makefile b/Documentation/Makefile deleted file mode 100644 index 9edae990..00000000 --- a/Documentation/Makefile +++ /dev/null @@ -1,265 +0,0 @@ -# Guard against environment variables -MAN1_TXT = -TECH_DOCS = -ARTICLES = -SP_ARTICLES = - -MAN1_TXT += $(filter-out \ - $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ - $(wildcard nvme-*.txt)) -MAN1_TXT += nvme.txt -MAN_TXT = $(MAN1_TXT) -MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT)) -MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) - -DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML) - -API_DOCS = -SP_ARTICLES += $(API_DOCS) -SP_ARTICLES += $(TECH_DOCS) - -ifneq ($(findstring $(MAKEFLAGS),s),s) -ifndef V - QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@; - QUIET_XMLTO = @echo ' ' XMLTO $@; - QUIET_DB2TEXI = @echo ' ' DB2TEXI $@; - QUIET_MAKEINFO = @echo ' ' MAKEINFO $@; - QUIET_DBLATEX = @echo ' ' DBLATEX $@; - QUIET_XSLTPROC = @echo ' ' XSLTPROC $@; - QUIET_GEN = @echo ' ' GEN $@; - QUIET_LINT = @echo ' ' LINT $@; - QUIET_STDERR = 2> /dev/null - QUIET_SUBDIR0 = +@subdir= - QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ - $(MAKE) $(PRINT_DIR) -C $$subdir - export V -endif -endif - -DOC_MAN1 = $(patsubst %.txt,%.1,$(MAN1_TXT)) - -ASCIIDOC = asciidoc -ASCIIDOC_EXTRA = -ASCIIDOC_DOCBOOK = docbook -ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) -TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) -MANPAGE_XSL = manpage-normal.xsl -XMLTO = xmlto -XMLTO_EXTRA = --skip-validation -INSTALL ?= install -RM ?= rm -f -MAN_REPO = ../../nvme-manpages - -ASCIIDOC_HTML = xhtml11 -ASCIIDOC_CONF = -f asciidoc.conf - -ifdef USE_ASCIIDOCTOR -ASCIIDOC = asciidoctor -ASCIIDOC_CONF = -ASCIIDOC_HTML = xhtml5 -ASCIIDOC_DOCBOOK = docbook5 -ASCIIDOC_EXTRA += -acompat-mode -ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions -ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' -ASCIIDOC_EXTRA += -amansource='NVMe' -ASCIIDOC_EXTRA += -amanmanual='NVMe Manual' -endif - -ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) -TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) - -MAKEINFO = makeinfo -INSTALL_INFO = install-info -DOCBOOK2X_TEXI = docbook2x-texi -DBLATEX = dblatex -ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex -ifndef PERL_PATH - PERL_PATH = /usr/bin/perl -endif - -ifdef DOCBOOK_XSL_172 -MANPAGE_XSL = manpage-1.72.xsl -else - ifndef ASCIIDOC_ROFF - endif -endif -ifdef MAN_BOLD_LITERAL -XMLTO_EXTRA += -m manpage-bold-literal.xsl -endif -ifdef DOCBOOK_SUPPRESS_SP -XMLTO_EXTRA += -m manpage-suppress-sp.xsl -endif - -ifndef MAN_BASE_URL -MAN_BASE_URL = file://$(htmldir)/ -endif -XMLTO_EXTRA += - -ifdef GNU_ROFF -XMLTO_EXTRA += -endif - -SHELL_PATH ?= $(SHELL) -# Shell quote; -SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) - -ifdef DEFAULT_PAGER -DEFAULT_PAGER_SQ = $(subst ','\'',$(DEFAULT_PAGER)) -endif - -ifdef DEFAULT_EDITOR -DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR)) -endif - -QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir -QUIET_SUBDIR1 = - -ifneq ($(findstring $(MAKEFLAGS),w),w) -PRINT_DIR = --no-print-directory -else # "make -w" -NO_SUBDIR = : -endif - -DESTDIR = -PREFIX ?= /usr/local - -all: man html - -html: $(DOC_HTML) - -man: man1 -man1: $(DOC_MAN1) - -install-no-build: - $(INSTALL) -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man1 - $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(PREFIX)/share/man/man1 - -install: install-man - -install-man: man - $(INSTALL) -d -m 755 $(DESTDIR)$(PREFIX)/share/man/man1 - $(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(PREFIX)/share/man/man1 - -docdep_prereqs = \ - cmd-list.made $(cmds_txt) - -doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl - $(QUIET_GEN)$(RM) $@+ $@ && \ - $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ - mv $@+ $@ - --include doc.dep - -cmds_txt = cmds-ancillaryinterrogators.txt \ - cmds-ancillarymanipulators.txt \ - cmds-mainporcelain.txt \ - cmds-plumbinginterrogators.txt \ - cmds-plumbingmanipulators.txt \ - cmds-synchingrepositories.txt \ - cmds-synchelpers.txt \ - cmds-purehelpers.txt \ - cmds-foreignscminterface.txt - -$(cmds_txt): cmd-list.made - -cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) - $(QUIET_GEN)$(RM) $@ && \ - $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \ - date >$@ - -clean: - $(RM) *.xml *.xml+ *.html+ - $(RM) *.texi *.texi+ *.texi++ nvme.info nvmeman.info - $(RM) *.pdf - $(RM) howto-index.txt howto/*.html doc.dep - $(RM) technical/*.html technical/api-index.txt - $(RM) $(cmds_txt) *.made - $(RM) manpage-base-url.xsl - $(RM) *~ - -clobber: clean - $(RM) *.html *.1 - -%.1 : %.xml - $(QUIET_XMLTO)$(RM) $@ && \ - $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< - -%.xml : %.txt - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d manpage -o $@+ $< && \ - mv $@+ $@ - -user-manual.xml: user-manual.txt user-manual.conf - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d article -o $@+ $< && \ - mv $@+ $@ - -technical/api-index.txt: technical/api-index-skel.txt \ - technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) - $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh - -XSLT = docbook.xsl -XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css - -nvme.info: user-manual.texi - $(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi - -user-manual.texi: user-manual.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \ - $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ - -user-manual.pdf: user-manual.xml - $(QUIET_DBLATEX)$(RM) $@+ $@ && \ - $(DBLATEX) -o $@+ -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty $< && \ - mv $@+ $@ - -nvmeman.texi: $(MAN_XML) cat-texi.perl - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \ - --to-stdout $(xml) &&) true) > $@++ && \ - $(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ - -nvmeman.info: nvmeman.texi - $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi - -$(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \ - mv $@+ $@ - -howto-index.txt: howto-index.sh $(wildcard howto/*.txt) - $(QUIET_GEN)$(RM) $@+ $@ && \ - '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \ - mv $@+ $@ - -WEBDOC_DEST = /pub/software/scm/nvme/docs - -$(MAN_HTML): %.html : %.txt - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -d manpage -o $@+ $< && \ - mv $@+ $@ - -quick-install: quick-install-man - -$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt - -install-webdoc : html - '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) - -require-manrepo:: - @if test ! -d $(MAN_REPO); \ - then echo "nvme-manpages repository must exist at $(MAN_REPO)"; exit 1; fi - -quick-install-man: require-manrepo - '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir) - -print-man1: - @for i in $(MAN1_TXT); do echo $$i; done - -.PHONY: FORCE diff --git a/Makefile b/Makefile index aa591969..0f15d30d 100644 --- a/Makefile +++ b/Makefile @@ -1,299 +1,39 @@ -CFLAGS ?= -O2 -g -Wall -Werror -override CFLAGS += -std=gnu99 -override CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__ -I. -LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?) -LIBHUGETLBFS = $(shell $(LD) -o /dev/null -lhugetlbfs >/dev/null 2>&1; echo $$?) -HAVE_SYSTEMD = $(shell pkg-config --exists libsystemd --atleast-version=242; echo $$?) -LIBJSONC_14 = $(shell pkg-config --atleast-version=0.14 json-c; echo $$?) -LIBJSONC = $(shell pkg-config json-c; echo $$?) -LIBZ = $(shell $(LD) -o /dev/null -lz >/dev/null 2>&1; echo $$?) -LIBOPENSSL = $(shell pkg-config --atleast-version=1.1.0 openssl; echo $$?) -NVME = nvme -INSTALL ?= install -DESTDIR = -DESTDIROLD = /usr/local/sbin -PREFIX ?= /usr -SYSCONFDIR = /etc -SBINDIR = $(PREFIX)/sbin -LIBDIR ?= $(PREFIX)/lib -SYSTEMDDIR ?= $(LIBDIR)/systemd -UDEVDIR ?= $(SYSCONFDIR)/udev -UDEVRULESDIR ?= $(UDEVDIR)/rules.d -DRACUTDIR ?= $(LIBDIR)/dracut -LIBNVME_DEPS = -LIBNVMEDIR = libnvme/ -LDFLAGS ?= -LIB_DEPENDS = - -CCANDIR=ccan/ -override CFLAGS += -I$(CCANDIR) - -ifeq ($(LIBUUID),0) - override LDFLAGS += -luuid - override CFLAGS += -DCONFIG_LIBUUID - override LIB_DEPENDS += uuid -endif - -ifeq ($(LIBHUGETLBFS),0) - override LDFLAGS += -lhugetlbfs - override CFLAGS += -DCONFIG_LIBHUGETLBFS - override LIB_DEPENDS += hugetlbfs -endif - -ifeq ($(LIBZ),0) - override LDFLAGS += -lz - override CFLAGS += -DLIBZ - override LIB_DEPENDS += zlib -endif - -ifeq ($(LIBOPENSSL),0) - override LDFLAGS += -lssl -lcrypto - override CFLAGS += -DCONFIG_OPENSSL - override LIB_DEPENDS += openssl -endif - -INC=-Iutil - -ifeq ($(HAVE_SYSTEMD),0) - override LDFLAGS += -lsystemd - override CFLAGS += -DHAVE_SYSTEMD -endif - -ifeq ($(LIBJSONC_14), 0) - override CFLAGS += -DLIBJSONC_14 -endif - -ifeq ($(LIBJSONC), 0) - override LDFLAGS += $(shell pkg-config --libs json-c) - override CFLAGS += $(shell pkg-config --cflags json-c) - override CFLAGS += -DCONFIG_JSONC -endif - -ifneq ("$(wildcard $(LIBNVMEDIR)/Makefile)","") - override LDFLAGS += -L$(LIBNVMEDIR)src -lnvme - override CFLAGS += -I$(LIBNVMEDIR)src - override LIBNVME_DEPS += libnvme -else -ifeq ($(shell pkg-config --exists libnvme; echo $$?),0) - override LDFLAGS += $(shell pkg-config --libs libnvme) - override CFLAGS += $(shell pkg-config --cflags libnvme) -else -$(error "No libnvme found") -endif -endif +# SPDX-License-Identifier: LGPL-2.1-or-later +# +# This file is part of libnvme. +# Copyright (c) 2021 Dell Inc. +# +# Authors: Martin Belanger +# +NAME := libnvme +.DEFAULT_GOAL := ${NAME} +BUILD-DIR := .build -RPMBUILD = rpmbuild -TAR = tar -RM = rm -f +${BUILD-DIR}: + meson $@ + @echo "Configuration located in: $@" + @echo "-------------------------------------------------------" -AUTHOR=Keith Busch +.PHONY: ${NAME} +${NAME}: ${BUILD-DIR} + ninja -C ${BUILD-DIR} -ifneq ($(findstring $(MAKEFLAGS),s),s) -ifndef V - QUIET_CC = @echo ' ' CC $@; -endif +.PHONY: clean +clean: +ifneq ("$(wildcard ${BUILD-DIR})","") + ninja -C ${BUILD-DIR} -t $@ endif -default: $(NVME) - -NVME-VERSION-FILE: FORCE - @$(SHELL_PATH) ./NVME-VERSION-GEN --include NVME-VERSION-FILE -override CFLAGS += -DNVME_VERSION='"$(NVME_VERSION)"' - -NVME_DPKG_VERSION=1~`lsb_release -sc` - -OBJS := nvme-print.o nvme-rpmb.o \ - fabrics.o nvme-models.o plugin.o - -UTIL_OBJS := util/argconfig.o util/suffix.o util/parser.o \ - util/cleanup.o util/base64.o - -ifneq ($(LIBJSONC), 0) -override UTIL_OBJS += util/json.o +.PHONY: purge +purge: +ifneq ("$(wildcard ${BUILD-DIR})","") + rm -rf ${BUILD-DIR} endif -PLUGIN_OBJS := \ - plugins/intel/intel-nvme.o \ - plugins/amzn/amzn-nvme.o \ - plugins/memblaze/memblaze-nvme.o \ - plugins/wdc/wdc-nvme.o \ - plugins/wdc/wdc-utils.o \ - plugins/huawei/huawei-nvme.o \ - plugins/netapp/netapp-nvme.o \ - plugins/toshiba/toshiba-nvme.o \ - plugins/micron/micron-nvme.o \ - plugins/seagate/seagate-nvme.o \ - plugins/virtium/virtium-nvme.o \ - plugins/shannon/shannon-nvme.o \ - plugins/dera/dera-nvme.o \ - plugins/scaleflux/sfx-nvme.o \ - plugins/transcend/transcend-nvme.o \ - plugins/zns/zns.o \ - plugins/nvidia/nvidia-nvme.o \ - plugins/ymtc/ymtc-nvme.o - -libnvme: - $(MAKE) -C $(LIBNVMEDIR) - -$(CCANDIR)config.h: $(CCANDIR)tools/configurator/configurator - $< > $@ - -$(CCANDIR)tools/configurator/configurator: $(CCANDIR)tools/configurator/configurator.c - $(QUIET_CC)$(CC) -D_GNU_SOURCE $< -o $@ - -nvme: nvme.o $(LIBNVME_DEPS) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FILE - $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $(NVME) $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) $(LDFLAGS) - -verify-no-dep: nvme.c nvme.h $(OBJS) $(UTIL_OBJS) NVME-VERSION-FILE - $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) $< -o $@ $(OBJS) $(UTIL_OBJS) $(LDFLAGS) - -nvme.o: nvme.c nvme.h nvme-print.h util/argconfig.h util/suffix.h fabrics.h $(CCANDIR)config.h - $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c $< - -%.o: %.c $(CCANDIR)config.h - $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $< - -doc: $(NVME) - $(MAKE) -C Documentation - -test: - $(MAKE) -C tests/ run - -all: doc - -clean: - $(RM) $(NVME) nvme.o $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) *~ a.out NVME-VERSION-FILE *.tar* nvme.spec version control nvme-*.deb 70-nvmf-autoconnect.conf - $(MAKE) -C Documentation clean - -$(MAKE) -C libnvme clean - $(RM) $(CCANDIR)/config.h - $(RM) $(CCANDIR)/tools/configurator/configurator - $(RM) tests/*.pyc - $(RM) verify-no-dep - -clobber: clean - $(MAKE) -C Documentation clobber - -install-man: - $(MAKE) -C Documentation install-no-build - -install-bin: default - $(RM) $(DESTDIROLD)/nvme - $(INSTALL) -d $(DESTDIR)$(SBINDIR) - $(INSTALL) -m 755 nvme $(DESTDIR)$(SBINDIR) - -install-bash-completion: - $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/bash-completion/completions - $(INSTALL) -m 644 -T ./completions/bash-nvme-completion.sh $(DESTDIR)$(PREFIX)/share/bash-completion/completions/nvme - -install-systemd: - $(INSTALL) -d $(DESTDIR)$(SYSTEMDDIR)/system - $(INSTALL) -m 644 ./nvmf-autoconnect/systemd/* $(DESTDIR)$(SYSTEMDDIR)/system - -install-udev: - $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR) - $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVRULESDIR) - -install-dracut: 70-nvmf-autoconnect.conf - $(INSTALL) -d $(DESTDIR)$(DRACUTDIR)/dracut.conf.d - $(INSTALL) -m 644 $< $(DESTDIR)$(DRACUTDIR)/dracut.conf.d - -install-zsh-completion: - $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/zsh/site-functions - $(INSTALL) -m 644 -T ./completions/_nvme $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_nvme - -install-hostparams: install-etc - if [ ! -s $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn ]; then \ - echo `$(DESTDIR)$(SBINDIR)/nvme gen-hostnqn` > $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn; \ - fi - if [ ! -s $(DESTDIR)$(SYSCONFDIR)/nvme/hostid ]; then \ - uuidgen > $(DESTDIR)$(SYSCONFDIR)/nvme/hostid; \ - fi - -install-etc: - $(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/nvme - touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostnqn - touch $(DESTDIR)$(SYSCONFDIR)/nvme/hostid - if [ ! -f $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf ]; then \ - $(INSTALL) -m 644 -T ./etc/discovery.conf.in $(DESTDIR)$(SYSCONFDIR)/nvme/discovery.conf; \ - fi - -install-spec: install-bin install-man install-bash-completion install-zsh-completion install-etc install-systemd install-udev install-dracut -install: install-spec install-hostparams - -nvme.spec: nvme.spec.in NVME-VERSION-FILE - sed -e 's/@VERSION@/$(NVME_VERSION)/g' < $< > $@+ - mv $@+ $@ - -70-nvmf-autoconnect.conf: nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in - sed -e 's#@UDEVRULESDIR@#$(UDEVRULESDIR)#g' < $< > $@+ - mv $@+ $@ - -dist: nvme.spec - git archive --format=tar --prefix=nvme-$(NVME_VERSION)/ HEAD > nvme-$(NVME_VERSION).tar - @echo $(NVME_VERSION) > version - $(TAR) rf nvme-$(NVME_VERSION).tar nvme.spec version - gzip -f -9 nvme-$(NVME_VERSION).tar - -control: nvme.control.in NVME-VERSION-FILE - sed -e 's/@VERSION@/$(NVME_VERSION)/g' < $< > $@+ - mv $@+ $@ - sed -e 's/@DEPENDS@/$(LIB_DEPENDS)/g' < $@ > $@+ - mv $@+ $@ - -pkg: control nvme.control.in - mkdir -p nvme-$(NVME_VERSION)$(SBINDIR) - mkdir -p nvme-$(NVME_VERSION)$(PREFIX)/share/man/man1 - mkdir -p nvme-$(NVME_VERSION)/DEBIAN/ - cp Documentation/*.1 nvme-$(NVME_VERSION)$(PREFIX)/share/man/man1 - cp nvme nvme-$(NVME_VERSION)$(SBINDIR) - cp control nvme-$(NVME_VERSION)/DEBIAN/ - -# Make a reproducible tar.gz in the super-directory. Uses -# git-restore-mtime if available to adjust timestamps. -../nvme-cli_$(NVME_VERSION).orig.tar.gz: - find . -type f -perm -u+rwx -exec chmod 0755 '{}' + - find . -type f -perm -u+rw '!' -perm -u+x -exec chmod 0644 '{}' + - if which git-restore-mtime >/dev/null; then git-restore-mtime; fi - git ls-files | tar cf ../nvme-cli_$(NVME_VERSION).orig.tar \ - --owner=root --group=root \ - --transform='s#^#nvme-cli-$(NVME_VERSION)/#' --files-from - - touch -d "`git log --format=%ci -1`" ../nvme-cli_$(NVME_VERSION).orig.tar - gzip -f -9 ../nvme-cli_$(NVME_VERSION).orig.tar - -dist-orig: ../nvme-cli_$(NVME_VERSION).orig.tar.gz - -# Create a throw-away changelog, which dpkg-buildpackage uses to -# determine the package version. -deb-changelog: - printf '%s\n\n * Auto-release.\n\n %s\n' \ - "nvme-cli ($(NVME_VERSION)-$(NVME_DPKG_VERSION)) `lsb_release -sc`; urgency=low" \ - "-- $(AUTHOR) `git log -1 --format=%cD`" \ - > debian/changelog - -deb: deb-changelog dist-orig - dpkg-buildpackage -uc -us -sa - -# After this target is build you need to do a debsign and dput on the -# ../.changes file to upload onto the relevant PPA. For example: -# -# > make AUTHOR='First Last ' \ -# NVME_DPKG_VERSION='0ubuntu1' deb-ppa -# > debsign .changes -# > dput ppa:/ppa .changes -# -# where lid is your launchpad.net ID. -deb-ppa: deb-changelog dist-orig - debuild -uc -us -S - -deb-light: $(NVME) pkg nvme.control.in - dpkg-deb --build nvme-$(NVME_VERSION) - -rpm: dist - $(RPMBUILD) --define '_prefix $(DESTDIR)$(PREFIX)' \ - --define '_libdir $(DESTDIR)${LIBDIR}' \ - --define '_sysconfdir $(DESTDIR)$(SYSCONFDIR)' \ - -ta nvme-$(NVME_VERSION).tar.gz +.PHONY: install dist +install dist: ${BUILD-DIR} + cd ${BUILD-DIR} && meson $@ -.PHONY: default doc all clean clobber install-man install-bin install -.PHONY: dist pkg dist-orig deb deb-light rpm FORCE test libnvme +.PHONY: test +test: ${BUILD-DIR} + ninja -C ${BUILD-DIR} $@ diff --git a/NVME-VERSION-GEN b/NVME-VERSION-GEN deleted file mode 100755 index 802bbd36..00000000 --- a/NVME-VERSION-GEN +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -GVF=NVME-VERSION-FILE -DEF_VER=v1.14 - -LF=' -' - -# First see if there is a version file (included in release tarballs), -# then try git-describe, then default. -if test -f version -then - VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && - VN=$(git describe --tags --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) && - case "$VN" in - *$LF*) (exit 1) ;; - v[0-9]*) - git update-index -q --refresh - test -z "$(git diff-index --name-only HEAD --)" || - VN="$VN-dirty" ;; - esac -then - VN=$(echo "$VN" | sed -e 's/-/./g'); -else - VN="$DEF_VER" -fi - -VN=$(expr "$VN" : v*'\(.*\)') - -if test -r $GVF -then - VC=$(sed -e 's/^NVME_VERSION = //' <$GVF) -else - VC=unset -fi -test "$VN" = "$VC" || { - echo >&2 "NVME_VERSION = $VN" - echo "NVME_VERSION = $VN" >$GVF -} - - diff --git a/README.md b/README.md index 1492a8bd..8bbaaa8a 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,17 @@ # nvme-cli NVM-Express user space tooling for Linux. -When cloning from source, you will need the libnvme submodule, so use: +nvme-cli uses meson as build system. In order to build nvme-cli +run following commands - $ git clone --recurse-submodules https://github.com/linux-nvme/nvme-cli + $ meson .build + $ ninja -C .build -If you already cloned without recursing submodules, you will need to initialize -and update it: - - $ git submodule update --init - -Or as two commands: +To install, run: - $ git submodule init - $ git submodule update + # meson install -C .build -To install, run: +There is a Makefile wrapper for meson for backwards compatiblily $ make # make install @@ -233,4 +229,4 @@ File: foo-plugin.c ``` After that, you just need to implement the functions you defined in each -ENTRY, then append the object file name to the Makefile's "OBJS". +ENTRY, then append the object file name to the meson.build "sources". diff --git a/ccan/tools/configurator/configurator.c b/ccan/tools/configurator/configurator.c deleted file mode 100644 index 0518c9b5..00000000 --- a/ccan/tools/configurator/configurator.c +++ /dev/null @@ -1,1077 +0,0 @@ -/* Simple tool to create config.h. - * Would be much easier with ccan modules, but deliberately standalone. - * - * Copyright 2011 Rusty Russell . MIT license. - * - * c12r_err, c12r_errx functions copied from ccan/err/err.c - * Copyright Rusty Russell . CC0 (Public domain) License. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#define _POSIX_C_SOURCE 200809L /* For pclose, popen, strdup */ - -#define EXIT_BAD_USAGE 1 -#define EXIT_TROUBLE_RUNNING 2 -#define EXIT_BAD_TEST 3 -#define EXIT_BAD_INPUT 4 - -#include -#include -#include -#include -#include -#include -#include - -#ifdef _MSC_VER -#define popen _popen -#define pclose _pclose -#endif - -#ifdef _MSC_VER -#define DEFAULT_COMPILER "cl" -/* Note: Dash options avoid POSIX path conversion when used under msys bash - * and are therefore preferred to slash (e.g. -nologo over /nologo) - * Note: Disable Warning 4200 "nonstandard extension used : zero-sized array - * in struct/union" for flexible array members. - */ -#define DEFAULT_FLAGS "-nologo -Zi -W4 -wd4200 " \ - "-D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS" -#define DEFAULT_OUTPUT_EXE_FLAG "-Fe:" -#else -#define DEFAULT_COMPILER "cc" -#define DEFAULT_FLAGS "-g3 -ggdb -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition" -#define DEFAULT_OUTPUT_EXE_FLAG "-o" -#endif - -#define OUTPUT_FILE "configurator.out" -#define INPUT_FILE "configuratortest.c" - -#ifdef _WIN32 -#define DIR_SEP "\\" -#else -#define DIR_SEP "/" -#endif - -static const char *progname = ""; -static int verbose; -static bool like_a_libtool = false; - -struct test { - const char *name; - const char *desc; - /* - * Template style flags (pick one): - * OUTSIDE_MAIN: - * - put a simple boilerplate main below it. - * DEFINES_FUNC: - * - defines a static function called func; adds ref to avoid warnings - * INSIDE_MAIN: - * - put this inside main(). - * DEFINES_EVERYTHING: - * - don't add any boilerplate at all. - * - * Execution flags: - * EXECUTE: - * - a runtime test; must compile, exit 0 means flag is set. - * MAY_NOT_COMPILE: - * - Only useful with EXECUTE: don't get upset if it doesn't compile. - * : - * - a compile test, if it compiles must run and exit 0. - */ - const char *style; - const char *depends; - const char *link; - const char *fragment; - const char *flags; - const char *overrides; /* On success, force this to '1' */ - bool done; - bool answer; -}; - -/* Terminated by a NULL name */ -static struct test *tests; - -static const struct test base_tests[] = { - { "HAVE_32BIT_OFF_T", "off_t is 32 bits", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, - "#include \n" - "int main(void) {\n" - " return sizeof(off_t) == 4 ? 0 : 1;\n" - "}\n" }, - { "HAVE_ALIGNOF", "__alignof__ support", - "INSIDE_MAIN", NULL, NULL, - "return __alignof__(double) > 0 ? 0 : 1;" }, - { "HAVE_ASPRINTF", "asprintf() declaration", - "DEFINES_FUNC", NULL, NULL, - "#ifndef _GNU_SOURCE\n" - "#define _GNU_SOURCE\n" - "#endif\n" - "#include \n" - "static char *func(int x) {" - " char *p;\n" - " if (asprintf(&p, \"%u\", x) == -1) \n" - " p = NULL;\n" - " return p;\n" - "}" }, - { "HAVE_ATTRIBUTE_COLD", "__attribute__((cold)) support", - "DEFINES_FUNC", NULL, NULL, - "static int __attribute__((cold)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_CONST", "__attribute__((const)) support", - "DEFINES_FUNC", NULL, NULL, - "static int __attribute__((const)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_DEPRECATED", "__attribute__((deprecated)) support", - "DEFINES_FUNC", NULL, NULL, - "static int __attribute__((deprecated)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_NONNULL", "__attribute__((nonnull)) support", - "DEFINES_FUNC", NULL, NULL, - "static char *__attribute__((nonnull)) func(char *p) { return p; }" }, - { "HAVE_ATTRIBUTE_RETURNS_NONNULL", "__attribute__((returns_nonnull)) support", - "DEFINES_FUNC", NULL, NULL, - "static const char *__attribute__((returns_nonnull)) func(void) { return \"hi\"; }" }, - { "HAVE_ATTRIBUTE_SENTINEL", "__attribute__((sentinel)) support", - "DEFINES_FUNC", NULL, NULL, - "static int __attribute__((sentinel)) func(int i, ...) { return i; }" }, - { "HAVE_ATTRIBUTE_PURE", "__attribute__((pure)) support", - "DEFINES_FUNC", NULL, NULL, - "static int __attribute__((pure)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_MAY_ALIAS", "__attribute__((may_alias)) support", - "OUTSIDE_MAIN", NULL, NULL, - "typedef short __attribute__((__may_alias__)) short_a;" }, - { "HAVE_ATTRIBUTE_NORETURN", "__attribute__((noreturn)) support", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static void __attribute__((noreturn)) func(int x) { exit(x); }" }, - { "HAVE_ATTRIBUTE_PRINTF", "__attribute__ format printf support", - "DEFINES_FUNC", NULL, NULL, - "static void __attribute__((format(__printf__, 1, 2))) func(const char *fmt, ...) { (void)fmt; }" }, - { "HAVE_ATTRIBUTE_UNUSED", "__attribute__((unused)) support", - "OUTSIDE_MAIN", NULL, NULL, - "static int __attribute__((unused)) func(int x) { return x; }" }, - { "HAVE_ATTRIBUTE_USED", "__attribute__((used)) support", - "OUTSIDE_MAIN", NULL, NULL, - "static int __attribute__((used)) func(int x) { return x; }" }, - { "HAVE_BACKTRACE", "backtrace() in ", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static int func(int x) {" - " void *bt[10];\n" - " return backtrace(bt, 10) < x;\n" - "}" }, - { "HAVE_BIG_ENDIAN", "big endian", - "INSIDE_MAIN|EXECUTE", NULL, NULL, - "union { int i; char c[sizeof(int)]; } u;\n" - "u.i = 0x01020304;\n" - "return u.c[0] == 0x01 && u.c[1] == 0x02 && u.c[2] == 0x03 && u.c[3] == 0x04 ? 0 : 1;" }, - { "HAVE_BSWAP_64", "bswap64 in byteswap.h", - "DEFINES_FUNC", "HAVE_BYTESWAP_H", NULL, - "#include \n" - "static int func(int x) { return bswap_64(x); }" }, - { "HAVE_BUILTIN_CHOOSE_EXPR", "__builtin_choose_expr support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_choose_expr(1, 0, \"garbage\");" }, - { "HAVE_BUILTIN_CLZ", "__builtin_clz support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_clz(1) == (sizeof(int)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZL", "__builtin_clzl support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_clzl(1) == (sizeof(long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CLZLL", "__builtin_clzll support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_clzll(1) == (sizeof(long long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CTZ", "__builtin_ctz support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ctz(1 << (sizeof(int)*8 - 1)) == (sizeof(int)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CTZL", "__builtin_ctzl support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ctzl(1UL << (sizeof(long)*8 - 1)) == (sizeof(long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CTZLL", "__builtin_ctzll support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ctzll(1ULL << (sizeof(long long)*8 - 1)) == (sizeof(long long)*8 - 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_CONSTANT_P", "__builtin_constant_p support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_constant_p(1) ? 0 : 1;" }, - { "HAVE_BUILTIN_EXPECT", "__builtin_expect support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_expect(argc == 1, 1) ? 0 : 1;" }, - { "HAVE_BUILTIN_FFS", "__builtin_ffs support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ffs(0) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSL", "__builtin_ffsl support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ffsl(0L) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_FFSLL", "__builtin_ffsll support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_ffsll(0LL) == 0 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNT", "__builtin_popcount support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_popcount(255) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNTL", "__builtin_popcountl support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_popcountl(255L) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_POPCOUNTLL", "__builtin_popcountll support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_popcountll(255LL) == 8 ? 0 : 1;" }, - { "HAVE_BUILTIN_TYPES_COMPATIBLE_P", "__builtin_types_compatible_p support", - "INSIDE_MAIN", NULL, NULL, - "return __builtin_types_compatible_p(char *, int) ? 1 : 0;" }, - { "HAVE_ICCARM_INTRINSICS", "", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "int func(int v) {\n" - " return __CLZ(__RBIT(v));\n" - "}" }, - { "HAVE_BYTESWAP_H", "", - "OUTSIDE_MAIN", NULL, NULL, - "#include \n" }, - { "HAVE_CLOCK_GETTIME", "clock_gettime() declaration", - "DEFINES_FUNC", "HAVE_STRUCT_TIMESPEC", NULL, - "#include \n" - "static struct timespec func(void) {\n" - " struct timespec ts;\n" - " clock_gettime(CLOCK_REALTIME, &ts);\n" - " return ts;\n" - "}\n" }, - { "HAVE_CLOCK_GETTIME_IN_LIBRT", "clock_gettime() in librt", - "DEFINES_FUNC", - "HAVE_STRUCT_TIMESPEC !HAVE_CLOCK_GETTIME", - "-lrt", - "#include \n" - "static struct timespec func(void) {\n" - " struct timespec ts;\n" - " clock_gettime(CLOCK_REALTIME, &ts);\n" - " return ts;\n" - "}\n", - /* This means HAVE_CLOCK_GETTIME, too */ - "HAVE_CLOCK_GETTIME" }, - { "HAVE_COMPOUND_LITERALS", "compound literal support", - "INSIDE_MAIN", NULL, NULL, - "int *foo = (int[]) { 1, 2, 3, 4 };\n" - "return foo[0] ? 0 : 1;" }, - { "HAVE_FCHDIR", "fchdir support", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, - "#include \n" - "#include \n" - "#include \n" - "#include \n" - "int main(void) {\n" - " int fd = open(\"..\", O_RDONLY);\n" - " return fchdir(fd) == 0 ? 0 : 1;\n" - "}\n" }, - { "HAVE_ERR_H", "", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static void func(int arg) {\n" - " if (arg == 0)\n" - " err(1, \"err %u\", arg);\n" - " if (arg == 1)\n" - " errx(1, \"err %u\", arg);\n" - " if (arg == 3)\n" - " warn(\"warn %u\", arg);\n" - " if (arg == 4)\n" - " warnx(\"warn %u\", arg);\n" - "}\n" }, - { "HAVE_FILE_OFFSET_BITS", "_FILE_OFFSET_BITS to get 64-bit offsets", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", - "HAVE_32BIT_OFF_T", NULL, - "#define _FILE_OFFSET_BITS 64\n" - "#include \n" - "int main(void) {\n" - " return sizeof(off_t) == 8 ? 0 : 1;\n" - "}\n" }, - { "HAVE_FOR_LOOP_DECLARATION", "for loop declaration support", - "INSIDE_MAIN", NULL, NULL, - "int ret = 1;\n" - "for (int i = 0; i < argc; i++) { ret = 0; };\n" - "return ret;" }, - { "HAVE_FLEXIBLE_ARRAY_MEMBER", "flexible array member support", - "OUTSIDE_MAIN", NULL, NULL, - "struct foo { unsigned int x; int arr[]; };" }, - { "HAVE_GETPAGESIZE", "getpagesize() in ", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static int func(void) { return getpagesize(); }" }, - { "HAVE_ISBLANK", "isblank() in ", - "DEFINES_FUNC", NULL, NULL, - "#ifndef _GNU_SOURCE\n" - "#define _GNU_SOURCE\n" - "#endif\n" - "#include \n" - "static int func(void) { return isblank(' '); }" }, - { "HAVE_LITTLE_ENDIAN", "little endian", - "INSIDE_MAIN|EXECUTE", NULL, NULL, - "union { int i; char c[sizeof(int)]; } u;\n" - "u.i = 0x01020304;\n" - "return u.c[0] == 0x04 && u.c[1] == 0x03 && u.c[2] == 0x02 && u.c[3] == 0x01 ? 0 : 1;" }, - { "HAVE_MEMMEM", "memmem in ", - "DEFINES_FUNC", NULL, NULL, - "#ifndef _GNU_SOURCE\n" - "#define _GNU_SOURCE\n" - "#endif\n" - "#include \n" - "static void *func(void *h, size_t hl, void *n, size_t nl) {\n" - "return memmem(h, hl, n, nl);" - "}\n", }, - { "HAVE_MEMRCHR", "memrchr in ", - "DEFINES_FUNC", NULL, NULL, - "#ifndef _GNU_SOURCE\n" - "#define _GNU_SOURCE\n" - "#endif\n" - "#include \n" - "static void *func(void *s, int c, size_t n) {\n" - "return memrchr(s, c, n);" - "}\n", }, - { "HAVE_MMAP", "mmap() declaration", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static void *func(int fd) {\n" - " return mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0);\n" - "}" }, - { "HAVE_PROC_SELF_MAPS", "/proc/self/maps exists", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, - "#include \n" - "#include \n" - "#include \n" - "int main(void) {\n" - " return open(\"/proc/self/maps\", O_RDONLY) != -1 ? 0 : 1;\n" - "}\n" }, - { "HAVE_QSORT_R_PRIVATE_LAST", "qsort_r cmp takes trailing arg", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, - "#ifndef _GNU_SOURCE\n" - "#define _GNU_SOURCE\n" - "#endif\n" - "#include \n" - "static int cmp(const void *lp, const void *rp, void *priv) {\n" - " *(unsigned int *)priv = 1;\n" - " return *(const int *)lp - *(const int *)rp; }\n" - "int main(void) {\n" - " int array[] = { 9, 2, 5 };\n" - " unsigned int called = 0;\n" - " qsort_r(array, 3, sizeof(int), cmp, &called);\n" - " return called && array[0] == 2 && array[1] == 5 && array[2] == 9 ? 0 : 1;\n" - "}\n" }, - { "HAVE_STRUCT_TIMESPEC", "struct timespec declaration", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static void func(void) {\n" - " struct timespec ts;\n" - " ts.tv_sec = ts.tv_nsec = 1;\n" - "}\n" }, - { "HAVE_SECTION_START_STOP", "__attribute__((section)) and __start/__stop", - "DEFINES_FUNC", NULL, NULL, - "static void *__attribute__((__section__(\"mysec\"))) p = &p;\n" - "static int func(void) {\n" - " extern void *__start_mysec[], *__stop_mysec[];\n" - " return __stop_mysec - __start_mysec;\n" - "}\n" }, - { "HAVE_STACK_GROWS_UPWARDS", "stack grows upwards", - "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, - "#include \n" - "static ptrdiff_t nest(const void *base, unsigned int i)\n" - "{\n" - " if (i == 0)\n" - " return (const char *)&i - (const char *)base;\n" - " return nest(base, i-1);\n" - "}\n" - "int main(int argc, char *argv[]) {\n" - " (void)argv;\n" - " return (nest(&argc, argc) > 0) ? 0 : 1;\n" - "}\n" }, - { "HAVE_STATEMENT_EXPR", "statement expression support", - "INSIDE_MAIN", NULL, NULL, - "return ({ int x = argc; x == argc ? 0 : 1; });" }, - { "HAVE_SYS_FILIO_H", "", - "OUTSIDE_MAIN", NULL, NULL, /* Solaris needs this for FIONREAD */ - "#include \n" }, - { "HAVE_SYS_TERMIOS_H", "", - "OUTSIDE_MAIN", NULL, NULL, - "#include \n" }, - { "HAVE_SYS_UNISTD_H", "", - "OUTSIDE_MAIN", NULL, NULL, - "#include \n" }, - { "HAVE_TYPEOF", "__typeof__ support", - "INSIDE_MAIN", NULL, NULL, - "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" }, - { "HAVE_UNALIGNED_ACCESS", "unaligned access to int", - "DEFINES_EVERYTHING|EXECUTE", NULL, NULL, - "#include \n" - "int main(int argc, char *argv[]) {\n" - " (void)argc;\n" - " char pad[sizeof(int *) * 1];\n" - " memcpy(pad, argv[0], sizeof(pad));\n" - " int *x = (int *)pad, *y = (int *)(pad + 1);\n" - " return *x == *y;\n" - "}\n" }, - { "HAVE_UTIME", "utime() declaration", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "#include \n" - "static int func(const char *filename) {\n" - " struct utimbuf times = { 0 };\n" - " return utime(filename, ×);\n" - "}" }, - { "HAVE_WARN_UNUSED_RESULT", "__attribute__((warn_unused_result))", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "#include \n" - "static __attribute__((warn_unused_result)) int func(int i) {\n" - " return i + 1;\n" - "}" }, - { "HAVE_OPENMP", "#pragma omp and -fopenmp support", - "INSIDE_MAIN|EXECUTE|MAY_NOT_COMPILE", NULL, NULL, - "int i;\n" - "#pragma omp parallel for\n" - "for(i = 0; i < 0; i++) {};\n" - "return 0;\n", - "-Werror -fopenmp" }, - { "HAVE_VALGRIND_MEMCHECK_H", "", - "OUTSIDE_MAIN", NULL, NULL, - "#include \n" }, - { "HAVE_UCONTEXT", "working \n" - "static int x = 0;\n" - "static char stack[2048];\n" - "static ucontext_t a, b;\n" - "static void fn(void) {\n" - " x |= 2;\n" - " setcontext(&b);\n" - " x |= 4;\n" - "}\n" - "int main(void) {\n" - " x |= 1;\n" - " getcontext(&a);\n" - " a.uc_stack.ss_sp = stack;\n" - " a.uc_stack.ss_size = sizeof(stack);\n" - " makecontext(&a, fn, 0);\n" - " swapcontext(&b, &a);\n" - " return (x == 3) ? 0 : 1;\n" - "}\n" - }, - { "HAVE_POINTER_SAFE_MAKECONTEXT", "passing pointers via makecontext()", - "DEFINES_EVERYTHING|EXECUTE|MAY_NOT_COMPILE", - "HAVE_UCONTEXT", NULL, - "#include \n" - "#include \n" - "static int worked = 0;\n" - "static char stack[1024];\n" - "static ucontext_t a, b;\n" - "static void fn(void *p, void *q) {\n" - " void *cp = &worked;\n" - " void *cq = (void *)(~((ptrdiff_t)cp));\n" - " if ((p == cp) && (q == cq))\n" - " worked = 1;\n" - " setcontext(&b);\n" - "}\n" - "int main(void) {\n" - " void *ap = &worked;\n" - " void *aq = (void *)(~((ptrdiff_t)ap));\n" - " getcontext(&a);\n" - " a.uc_stack.ss_sp = stack;\n" - " a.uc_stack.ss_size = sizeof(stack);\n" - " makecontext(&a, (void (*)(void))fn, 2, ap, aq);\n" - " swapcontext(&b, &a);\n" - " return worked ? 0 : 1;\n" - "}\n" - }, - { "HAVE_BUILTIN_CPU_SUPPORTS", "__builtin_cpu_supports()", - "DEFINES_FUNC", NULL, NULL, - "#include \n" - "static bool func(void) {\n" - " return __builtin_cpu_supports(\"mmx\");\n" - "}" - }, - { "HAVE_SYS_RANDOM", "", - "OUTSIDE_MAIN", NULL, NULL, - "#include \n" }, -}; - -static void c12r_err(int eval, const char *fmt, ...) -{ - int err_errno = errno; - va_list ap; - - fprintf(stderr, "%s: ", progname); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, ": %s\n", strerror(err_errno)); - exit(eval); -} - -static void c12r_errx(int eval, const char *fmt, ...) -{ - va_list ap; - - fprintf(stderr, "%s: ", progname); - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - fprintf(stderr, "\n"); - exit(eval); -} - -static void start_test(const char *what, const char *why) -{ - if (like_a_libtool) { - printf("%s%s... ", what, why); - fflush(stdout); - } -} - -static void end_test(bool result) -{ - if (like_a_libtool) - printf("%s\n", result ? "yes" : "no"); -} - -static size_t fcopy(FILE *fsrc, FILE *fdst) -{ - char buffer[BUFSIZ]; - size_t rsize, wsize; - size_t copied = 0; - - while ((rsize = fread(buffer, 1, BUFSIZ, fsrc)) > 0) { - wsize = fwrite(buffer, 1, rsize, fdst); - copied += wsize; - if (wsize != rsize) - break; - } - - return copied; -} - -static char *grab_stream(FILE *file) -{ - size_t max, ret, size = 0; - char *buffer; - - max = BUFSIZ; - buffer = malloc(max); - while ((ret = fread(buffer+size, 1, max - size, file)) == max - size) { - size += ret; - buffer = realloc(buffer, max *= 2); - } - size += ret; - if (ferror(file)) - c12r_err(EXIT_TROUBLE_RUNNING, "reading from command"); - buffer[size] = '\0'; - return buffer; -} - -static char *run(const char *cmd, int *exitstatus) -{ - static const char redir[] = " 2>&1"; - size_t cmdlen; - char *cmdredir; - FILE *cmdout; - char *ret; - - cmdlen = strlen(cmd); - cmdredir = malloc(cmdlen + sizeof(redir)); - memcpy(cmdredir, cmd, cmdlen); - memcpy(cmdredir + cmdlen, redir, sizeof(redir)); - - cmdout = popen(cmdredir, "r"); - if (!cmdout) - c12r_err(EXIT_TROUBLE_RUNNING, "popen \"%s\"", cmdredir); - - free(cmdredir); - - ret = grab_stream(cmdout); - *exitstatus = pclose(cmdout); - return ret; -} - -static char *connect_args(const char *argv[], const char *outflag, - const char *files) -{ - unsigned int i; - char *ret; - size_t len = strlen(outflag) + strlen(files) + 1; - - for (i = 1; argv[i]; i++) - len += 1 + strlen(argv[i]); - - ret = malloc(len); - len = 0; - for (i = 1; argv[i]; i++) { - strcpy(ret + len, argv[i]); - len += strlen(argv[i]); - if (argv[i+1] || *outflag) - ret[len++] = ' '; - } - strcpy(ret + len, outflag); - len += strlen(outflag); - strcpy(ret + len, files); - return ret; -} - -static struct test *find_test(const char *name) -{ - unsigned int i; - - for (i = 0; tests[i].name; i++) { - if (strcmp(tests[i].name, name) == 0) - return &tests[i]; - } - c12r_errx(EXIT_BAD_TEST, "Unknown test %s", name); - abort(); -} - -#define PRE_BOILERPLATE "/* Test program generated by configurator. */\n" -#define MAIN_START_BOILERPLATE \ - "int main(int argc, char *argv[]) {\n" \ - " (void)argc;\n" \ - " (void)argv;\n" -#define USE_FUNC_BOILERPLATE "(void)func;\n" -#define MAIN_BODY_BOILERPLATE "return 0;\n" -#define MAIN_END_BOILERPLATE "}\n" - -static bool run_test(const char *cmd, const char *wrapper, struct test *test) -{ - char *output, *newcmd; - FILE *outf; - int status; - - if (test->done) - return test->answer; - - if (test->depends) { - size_t len; - const char *deps = test->depends; - char *dep; - - /* Space-separated dependencies, could be ! for inverse. */ - while ((len = strcspn(deps, " ")) != 0) { - bool positive = true; - if (deps[len]) { - dep = strdup(deps); - dep[len] = '\0'; - } else { - dep = (char *)deps; - } - - if (dep[0] == '!') { - dep++; - positive = false; - } - if (run_test(cmd, wrapper, find_test(dep)) != positive) { - test->answer = false; - test->done = true; - return test->answer; - } - if (deps[len]) - free(dep); - - deps += len; - deps += strspn(deps, " "); - } - } - - outf = fopen(INPUT_FILE, verbose > 1 ? "w+" : "w"); - if (!outf) - c12r_err(EXIT_TROUBLE_RUNNING, "creating %s", INPUT_FILE); - - fprintf(outf, "%s", PRE_BOILERPLATE); - - if (strstr(test->style, "INSIDE_MAIN")) { - fprintf(outf, "%s", MAIN_START_BOILERPLATE); - fprintf(outf, "%s", test->fragment); - fprintf(outf, "%s", MAIN_END_BOILERPLATE); - } else if (strstr(test->style, "OUTSIDE_MAIN")) { - fprintf(outf, "%s", test->fragment); - fprintf(outf, "%s", MAIN_START_BOILERPLATE); - fprintf(outf, "%s", MAIN_BODY_BOILERPLATE); - fprintf(outf, "%s", MAIN_END_BOILERPLATE); - } else if (strstr(test->style, "DEFINES_FUNC")) { - fprintf(outf, "%s", test->fragment); - fprintf(outf, "%s", MAIN_START_BOILERPLATE); - fprintf(outf, "%s", USE_FUNC_BOILERPLATE); - fprintf(outf, "%s", MAIN_BODY_BOILERPLATE); - fprintf(outf, "%s", MAIN_END_BOILERPLATE); - } else if (strstr(test->style, "DEFINES_EVERYTHING")) { - fprintf(outf, "%s", test->fragment); - } else - c12r_errx(EXIT_BAD_TEST, "Unknown style for test %s: %s", - test->name, test->style); - - if (verbose > 1) { - fseek(outf, 0, SEEK_SET); - fcopy(outf, stdout); - } - - fclose(outf); - - newcmd = strdup(cmd); - - if (test->flags) { - newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ") - + strlen(test->flags) + 1); - strcat(newcmd, " "); - strcat(newcmd, test->flags); - if (verbose > 1) - printf("Extra flags line: %s", newcmd); - } - - if (test->link) { - newcmd = realloc(newcmd, strlen(newcmd) + strlen(" ") - + strlen(test->link) + 1); - strcat(newcmd, " "); - strcat(newcmd, test->link); - if (verbose > 1) - printf("Extra link line: %s", newcmd); - } - - start_test("checking for ", test->desc); - output = run(newcmd, &status); - - free(newcmd); - - if (status != 0 || strstr(output, "warning")) { - if (verbose) - printf("Compile %s for %s, status %i: %s\n", - status ? "fail" : "warning", - test->name, status, output); - if (strstr(test->style, "EXECUTE") - && !strstr(test->style, "MAY_NOT_COMPILE")) - c12r_errx(EXIT_BAD_TEST, - "Test for %s did not compile:\n%s", - test->name, output); - test->answer = false; - free(output); - } else { - /* Compile succeeded. */ - free(output); - /* We run INSIDE_MAIN tests for sanity checking. */ - if (strstr(test->style, "EXECUTE") - || strstr(test->style, "INSIDE_MAIN")) { - char *cmd = malloc(strlen(wrapper) + strlen(" ." DIR_SEP OUTPUT_FILE) + 1); - - strcpy(cmd, wrapper); - strcat(cmd, " ." DIR_SEP OUTPUT_FILE); - output = run(cmd, &status); - if (wrapper) { - free(cmd); - } - if (!strstr(test->style, "EXECUTE") && status != 0) - c12r_errx(EXIT_BAD_TEST, - "Test for %s failed with %i:\n%s", - test->name, status, output); - if (verbose && status) - printf("%s exited %i\n", test->name, status); - free(output); - } - test->answer = (status == 0); - } - test->done = true; - end_test(test->answer); - - if (test->answer && test->overrides) { - struct test *override = find_test(test->overrides); - override->done = true; - override->answer = true; - } - return test->answer; -} - -static char *any_field(char **fieldname) -{ - char buf[1000]; - for (;;) { - char *p, *eq; - - if (!fgets(buf, sizeof(buf), stdin)) - return NULL; - - p = buf; - /* Ignore whitespace, lines starting with # */ - while (*p == ' ' || *p == '\t') - p++; - if (*p == '#' || *p == '\n') - continue; - - eq = strchr(p, '='); - if (!eq) - c12r_errx(EXIT_BAD_INPUT, "no = in line: %s", p); - *eq = '\0'; - *fieldname = strdup(p); - p = eq + 1; - if (strlen(p) && p[strlen(p)-1] == '\n') - p[strlen(p)-1] = '\0'; - return strdup(p); - } -} - -static char *read_field(const char *name, bool compulsory) -{ - char *fieldname, *value; - - value = any_field(&fieldname); - if (!value) { - if (!compulsory) - return NULL; - c12r_errx(EXIT_BAD_INPUT, "Could not read field %s", name); - } - if (strcmp(fieldname, name) != 0) - c12r_errx(EXIT_BAD_INPUT, - "Expected field %s not %s", name, fieldname); - return value; -} - -/* Test descriptions from stdin: - * Lines starting with # or whitespace-only are ignored. - * - * First three non-ignored lines must be: - * var= - * desc= - * style=OUTSIDE_MAIN DEFINES_FUNC INSIDE_MAIN DEFINES_EVERYTHING EXECUTE MAY_NOT_COMPILE - * - * Followed by optional lines: - * depends= - * link= - * flags= - * overrides= - * - * Finally a code line, either: - * code= OR - * code= - * - * - * - * And looks like this next comment: */ -/*END*/ -static bool read_test(struct test *test) -{ - char *field, *value; - char buf[1000]; - - memset(test, 0, sizeof(*test)); - test->name = read_field("var", false); - if (!test->name) - return false; - test->desc = read_field("desc", true); - test->style = read_field("style", true); - /* Read any optional fields. */ - while ((value = any_field(&field)) != NULL) { - if (strcmp(field, "depends") == 0) - test->depends = value; - else if (strcmp(field, "link") == 0) - test->link = value; - else if (strcmp(field, "flags") == 0) - test->flags = value; - else if (strcmp(field, "overrides") == 0) - test->overrides = value; - else if (strcmp(field, "code") == 0) - break; - else - c12r_errx(EXIT_BAD_INPUT, "Unknown field %s in %s", - field, test->name); - } - if (!value) - c12r_errx(EXIT_BAD_INPUT, "Missing code in %s", test->name); - - if (strlen(value) == 0) { - /* Multiline program, read to END comment */ - while (fgets(buf, sizeof(buf), stdin) != 0) { - size_t n; - if (strncmp(buf, "/*END*/", 7) == 0) - break; - n = strlen(value); - value = realloc(value, n + strlen(buf) + 1); - strcpy(value + n, buf); - n += strlen(buf); - } - } - test->fragment = value; - return true; -} - -static void read_tests(size_t num_tests) -{ - while (read_test(tests + num_tests)) { - num_tests++; - tests = realloc(tests, (num_tests + 1) * sizeof(tests[0])); - tests[num_tests].name = NULL; - } -} - -int main(int argc, const char *argv[]) -{ - char *cmd; - unsigned int i; - const char *default_args[] - = { "", DEFAULT_COMPILER, DEFAULT_FLAGS, NULL }; - const char *outflag = DEFAULT_OUTPUT_EXE_FLAG; - const char *configurator_cc = NULL; - const char *wrapper = ""; - const char *orig_cc; - const char *varfile = NULL; - const char *headerfile = NULL; - bool extra_tests = false; - FILE *outf; - - if (argc > 0) - progname = argv[0]; - - while (argc > 1) { - if (strcmp(argv[1], "--help") == 0) { - printf("Usage: configurator [-v] [--var-file=] [-O] [--configurator-cc=] [--wrapper=] [--autotools-style] [--extra-tests] [ ...]\n" - " will have \" \" appended\n" - "Default: %s %s %s\n", - DEFAULT_COMPILER, DEFAULT_FLAGS, - DEFAULT_OUTPUT_EXE_FLAG); - exit(0); - } - if (strncmp(argv[1], "-O", 2) == 0) { - argc--; - argv++; - outflag = argv[1] + 2; - if (!*outflag) { - fprintf(stderr, - "%s: option requires an argument -- O\n", - argv[0]); - exit(EXIT_BAD_USAGE); - } - } else if (strcmp(argv[1], "-v") == 0) { - argc--; - argv++; - verbose++; - } else if (strcmp(argv[1], "-vv") == 0) { - argc--; - argv++; - verbose += 2; - } else if (strncmp(argv[1], "--configurator-cc=", 18) == 0) { - configurator_cc = argv[1] + 18; - argc--; - argv++; - } else if (strncmp(argv[1], "--wrapper=", 10) == 0) { - wrapper = argv[1] + 10; - argc--; - argv++; - } else if (strncmp(argv[1], "--var-file=", 11) == 0) { - varfile = argv[1] + 11; - argc--; - argv++; - } else if (strcmp(argv[1], "--autotools-style") == 0) { - like_a_libtool = true; - argc--; - argv++; - } else if (strncmp(argv[1], "--header-file=", 14) == 0) { - headerfile = argv[1] + 14; - argc--; - argv++; - } else if (strcmp(argv[1], "--extra-tests") == 0) { - extra_tests = true; - argc--; - argv++; - } else if (strcmp(argv[1], "--") == 0) { - break; - } else if (argv[1][0] == '-') { - c12r_errx(EXIT_BAD_USAGE, "Unknown option %s", argv[1]); - } else { - break; - } - } - - if (argc == 1) - argv = default_args; - - /* Copy with NULL entry at end */ - tests = calloc(sizeof(base_tests)/sizeof(base_tests[0]) + 1, - sizeof(base_tests[0])); - memcpy(tests, base_tests, sizeof(base_tests)); - - if (extra_tests) - read_tests(sizeof(base_tests)/sizeof(base_tests[0])); - - orig_cc = argv[1]; - if (configurator_cc) - argv[1] = configurator_cc; - - cmd = connect_args(argv, outflag, OUTPUT_FILE " " INPUT_FILE); - if (like_a_libtool) { - start_test("Making autoconf users comfortable", ""); - sleep(1); - end_test(1); - } - for (i = 0; tests[i].name; i++) - run_test(cmd, wrapper, &tests[i]); - free(cmd); - - remove(OUTPUT_FILE); - remove(INPUT_FILE); - - if (varfile) { - FILE *vars; - - if (strcmp(varfile, "-") == 0) - vars = stdout; - else { - start_test("Writing variables to ", varfile); - vars = fopen(varfile, "a"); - if (!vars) - c12r_err(EXIT_TROUBLE_RUNNING, - "Could not open %s", varfile); - } - for (i = 0; tests[i].name; i++) - fprintf(vars, "%s=%u\n", tests[i].name, tests[i].answer); - if (vars != stdout) { - if (fclose(vars) != 0) - c12r_err(EXIT_TROUBLE_RUNNING, - "Closing %s", varfile); - end_test(1); - } - } - - if (headerfile) { - start_test("Writing header to ", headerfile); - outf = fopen(headerfile, "w"); - if (!outf) - c12r_err(EXIT_TROUBLE_RUNNING, - "Could not open %s", headerfile); - } else - outf = stdout; - - fprintf(outf, "/* Generated by CCAN configurator */\n" - "#ifndef CCAN_CONFIG_H\n" - "#define CCAN_CONFIG_H\n"); - fprintf(outf, "#ifndef _GNU_SOURCE\n"); - fprintf(outf, "#define _GNU_SOURCE /* Always use GNU extensions. */\n"); - fprintf(outf, "#endif\n"); - fprintf(outf, "#define CCAN_COMPILER \"%s\"\n", orig_cc); - cmd = connect_args(argv + 1, "", ""); - fprintf(outf, "#define CCAN_CFLAGS \"%s\"\n", cmd); - free(cmd); - fprintf(outf, "#define CCAN_OUTPUT_EXE_CFLAG \"%s\"\n\n", outflag); - /* This one implies "#include &1 | grep "^Your code" | awk '{print $$7}';\ - echo "--------------------------------------------";\ - pep8 $${i}; \ - echo "pep8 :- "; \ - echo "flake8 :- "; \ - flake8 $${i}; \ - done - -cleanall: clean - @rm -fr *.pyc Documentation - -clean: - @rm -fr *.pyc