c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 11:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix powerpc build

Browse Source 
Unlike other architectures which sanitize the LDFLAGS from the
environment in arch/<arch>/Makefile.  The powerpc Makefile
allows LDFLAGS to be passed through resulting in the following
build failure.

  /usr/bin/ld: unrecognized option '-Wl,-z,relro'

LDFLAGS is set in /usr/lib/rpm/redhat/macros by default.  Clear
the environment variable when building kmods for powerpc.

Additionally, now that ppc64le exists it's not longer safe to
assume a powerpc system is big endian.  Rely on the endianness
provided by the compiler.

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #5856
This commit is contained in:
Brian Behlendorf 2017-03-06 09:17:24 -08:00 committed by GitHub
parent ebd9aa8c17
commit fb963d33ee
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libspl/include/sys/isa_defs.h
View File

@ -98,10 +98,6 @@ extern "C" {
#endif #endif
#endif #endif
#if !defined(_BIG_ENDIAN)
#define _BIG_ENDIAN
#endif
#define _SUNOS_VTOC_16 #define _SUNOS_VTOC_16
/* arm arch specific defines */ /* arm arch specific defines */

5
rpm/generic/zfs-kmod.spec.in
View File

@ -86,6 +86,11 @@ BuildRequires: kmod-spl-devel = %{version}
%global KmodsMetaRequires spl-kmod %global KmodsMetaRequires spl-kmod
%endif %endif
# LDFLAGS are not sanitized by arch/powerpc/Makefile (unlike other arches)
%ifarch ppc ppc64 ppc64le
%global __global_ldflags %{nil}
%endif
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
%define prefix /usr %define prefix /usr
%endif %endif

5
rpm/redhat/zfs-kmod.spec.in
View File

@ -21,6 +21,11 @@ Requires: spl-kmod\n\
Requires: @PACKAGE@ = %{version}\n\ Requires: @PACKAGE@ = %{version}\n\
Conflicts: @PACKAGE@-dkms\n\n" > %{_sourcedir}/kmod-preamble) Conflicts: @PACKAGE@-dkms\n\n" > %{_sourcedir}/kmod-preamble)
# LDFLAGS are not sanitized by arch/powerpc/Makefile (unlike other arches)
%ifarch ppc ppc64 ppc64le
%global __global_ldflags %{nil}
%endif
%description %description
This package contains the ZFS kernel modules. This package contains the ZFS kernel modules.