From d9400aede6ad32dde7021c739f0e8c7b570432af Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 10 Sep 2010 11:43:12 -0700 Subject: [PATCH] Exclude atomic.S source from dist rules The zfs package supports the option --with-config=srpm which is used to bootstrap configure to allow the 'make srpm' target to work. This has the advantage of allowing creation of source rpms without having all your -devel packages installed. This source package can then be feed back in to an automated build farm which only installs the required packages listed by the srpm. This ensures that all proper dependencies are expressed by the source package, because if they are not you will get configure/build failures. The trouble here is that --with-config=srpm prevents the architecture check from running resulting in TARGET_ASM_DIR being set to the default asm-generic. The 'make dist' rule then fails because there is no asm-generic/atomic.S file because it is generated at build time. To handle this I have added an empty file asm-generic/atomic.S simply as a place holder for 'make dist'. --- lib/libspl/asm-generic/atomic.S | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 lib/libspl/asm-generic/atomic.S diff --git a/lib/libspl/asm-generic/atomic.S b/lib/libspl/asm-generic/atomic.S new file mode 100644 index 0000000..7550fd9 --- /dev/null +++ b/lib/libspl/asm-generic/atomic.S @@ -0,0 +1,6 @@ +Stub file for 'make dist' distdir rule. + +This file is directly referenced by ../Makefile.am as a source +file and thus will be expected by 'make dist'. To avoid this +being a problem this stub file was added. It will be overwritten +at build time based on assmebly generated from atomic.c. -- 1.8.3.1