projects / packages / zfs.git / blame
| Commit | Line | Data |
|---|---|---|
| 63b2f900 JB |
1 | --- zfs-zfs-0.8.1/config/zfs-build.m4.orig 2019-06-14 18:43:18.000000000 +0200 |
| 2 | +++ zfs-zfs-0.8.1/config/zfs-build.m4 2019-07-17 16:03:44.885415916 +0200 | |
| 3 | @@ -110,7 +110,7 @@ | |
| 4 | [enable_debug_kmem=no]) | |
| 5 | ||
| 6 | AS_IF([test "x$enable_debug_kmem" = xyes], [ | |
| 7 | - KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM" | |
| 8 | + KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS -DDEBUG_KMEM" | |
| 9 | DEBUG_KMEM_ZFS="_with_debug_kmem" | |
| 10 | ], [ | |
| 11 | DEBUG_KMEM_ZFS="_without_debug_kmem" | |
| 12 | @@ -140,7 +140,7 @@ | |
| 13 | [enable_debug_kmem_tracking=no]) | |
| 14 | ||
| 15 | AS_IF([test "x$enable_debug_kmem_tracking" = xyes], [ | |
| 16 | - KERNEL_DEBUG_CPPFLAGS+=" -DDEBUG_KMEM_TRACKING" | |
| 17 | + KERNEL_DEBUG_CPPFLAGS="$KERNEL_DEBUG_CPPFLAGS -DDEBUG_KMEM_TRACKING" | |
| 18 | DEBUG_KMEM_TRACKING_ZFS="_with_debug_kmem_tracking" | |
| 19 | ], [ | |
| 20 | DEBUG_KMEM_TRACKING_ZFS="_without_debug_kmem_tracking" | |
| 21 | @@ -242,10 +242,10 @@ | |
| 22 | ]) | |
| 23 | ||
| 24 | RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"' | |
| 25 | - RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_ZFS) 1"' | |
| 26 | - RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"' | |
| 27 | - RPM_DEFINE_COMMON+=' --define "$(DEBUGINFO_ZFS) 1"' | |
| 28 | - RPM_DEFINE_COMMON+=' --define "$(ASAN_ZFS) 1"' | |
| 29 | + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUG_KMEM_ZFS) 1"' | |
| 30 | + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUG_KMEM_TRACKING_ZFS) 1"' | |
| 31 | + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(DEBUGINFO_ZFS) 1"' | |
| 32 | + RPM_DEFINE_COMMON="$RPM_DEFINE_COMMON"' --define "$(ASAN_ZFS) 1"' | |
| 33 | ||
| 34 | RPM_DEFINE_UTIL=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"' | |
| 35 | ||
| 36 | @@ -258,16 +258,16 @@ | |
| 37 | RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"' | |
| 38 | ]) | |
| 39 | AS_IF([test -n "$udevdir" ], [ | |
| 40 | - RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"' | |
| 41 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir $(udevdir)"' | |
| 42 | ]) | |
| 43 | AS_IF([test -n "$udevruledir" ], [ | |
| 44 | - RPM_DEFINE_UTIL+=' --define "_udevdir $(udevruledir)"' | |
| 45 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_udevdir $(udevruledir)"' | |
| 46 | ]) | |
| 47 | - RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)' | |
| 48 | - RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)' | |
| 49 | - RPM_DEFINE_UTIL+=' $(DEFINE_PYZFS)' | |
| 50 | - RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_VERSION)' | |
| 51 | - RPM_DEFINE_UTIL+=' $(DEFINE_PYTHON_PKG_VERSION)' | |
| 52 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_INITRAMFS)' | |
| 53 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_SYSTEMD)' | |
| 54 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYZFS)' | |
| 55 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_VERSION)' | |
| 56 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' $(DEFINE_PYTHON_PKG_VERSION)' | |
| 57 | ||
| 58 | dnl # Override default lib directory on Debian/Ubuntu systems. The | |
| 59 | dnl # provided /usr/lib/rpm/platform/<arch>/macros files do not | |
| 60 | @@ -279,14 +279,14 @@ | |
| 61 | dnl # | |
| 62 | AS_IF([test "$DEFAULT_PACKAGE" = "deb"], [ | |
| 63 | MULTIARCH_LIBDIR="lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)" | |
| 64 | - RPM_DEFINE_UTIL+=' --define "_lib $(MULTIARCH_LIBDIR)"' | |
| 65 | + RPM_DEFINE_UTIL="$RPM_DEFINE_UTIL"' --define "_lib $(MULTIARCH_LIBDIR)"' | |
| 66 | AC_SUBST(MULTIARCH_LIBDIR) | |
| 67 | ]) | |
| 68 | ||
| 69 | RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' | |
| 70 | - RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"' | |
| 71 | - RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"' | |
| 72 | - RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' | |
| 73 | + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "ksrc $(LINUX)"' | |
| 74 | + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "kobj $(LINUX_OBJ)"' | |
| 75 | + RPM_DEFINE_KMOD="$RPM_DEFINE_KMOD"' --define "_wrong_version_format_terminate_build 0"' | |
| 76 | ||
| 77 | RPM_DEFINE_DKMS='' | |
| 78 |