mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-21 22:41:09 +02:00
sys-fs/xfsprogs: Fix cross compile build error
Add configure fixes for cross compile errors. Bump revision from xfsprogs-3.2.2.ebuild to xfsprogs-3.2.2-r1.ebuild. Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand
parent
facbc99a1b
commit
8c0ede733f
@ -0,0 +1,215 @@
|
||||
From 79e570e3212c067aa1b48c27d70d226510f5f157 Mon Sep 17 00:00:00 2001
|
||||
From: Geoff Levand <geoff@infradead.org>
|
||||
Date: Fri, 10 Jul 2015 11:21:10 -0700
|
||||
Subject: [PATCH] Fix cross-compile builds
|
||||
|
||||
Add AX_PROG_CC_FOR_BUILD to configure.ac and change the makefile to use
|
||||
CC_FOR_BUILD.
|
||||
|
||||
Signed-off-by: Geoff Levand <geoff@infradead.org>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
include/builddefs.in | 4 ++
|
||||
libxfs/Makefile | 6 +-
|
||||
m4/Makefile | 1 +
|
||||
m4/m4-ax_prog_cc_for_build.m4 | 125 ++++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 134 insertions(+), 3 deletions(-)
|
||||
create mode 100644 m4/m4-ax_prog_cc_for_build.m4
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index ae17c68..e384431 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -7,6 +7,7 @@ AC_CONFIG_HEADER(include/platform_defs.h)
|
||||
AC_PREFIX_DEFAULT(/usr)
|
||||
|
||||
AC_PROG_LIBTOOL
|
||||
+AX_PROG_CC_FOR_BUILD
|
||||
|
||||
AC_ARG_ENABLE(shared,
|
||||
[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
|
||||
diff --git a/include/builddefs.in b/include/builddefs.in
|
||||
index 944bcf6..f02b36f 100644
|
||||
--- a/include/builddefs.in
|
||||
+++ b/include/builddefs.in
|
||||
@@ -76,6 +76,10 @@ SHELL = @SHELL@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
MAKEDEPEND = @makedepend@
|
||||
|
||||
+# For cross-compile support
|
||||
+CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
+
|
||||
MSGFMT = @msgfmt@
|
||||
MSGMERGE = @msgmerge@
|
||||
XGETTEXT = @xgettext@
|
||||
diff --git a/libxfs/Makefile b/libxfs/Makefile
|
||||
index ae15a5d..a063c07 100644
|
||||
--- a/libxfs/Makefile
|
||||
+++ b/libxfs/Makefile
|
||||
@@ -66,8 +66,8 @@ LDIRT = gen_crc32table crc32table.h crc32selftest
|
||||
default: crc32selftest ltdepend $(LTLIBRARY)
|
||||
|
||||
crc32table.h: gen_crc32table.c
|
||||
- @echo " [CC] gen_crc32table"
|
||||
- $(Q) $(CC) $(CFLAGS) -o gen_crc32table $<
|
||||
+ @echo " [CC_FOR_BUILD] gen_crc32table"
|
||||
+ $(Q) $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o gen_crc32table $<
|
||||
@echo " [GENERATE] $@"
|
||||
$(Q) ./gen_crc32table > crc32table.h
|
||||
|
||||
@@ -78,7 +78,7 @@ crc32table.h: gen_crc32table.c
|
||||
# disk.
|
||||
crc32selftest: gen_crc32table.c crc32table.h crc32.c
|
||||
@echo " [TEST] CRC32"
|
||||
- $(Q) $(CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
+ $(Q) $(CC_FOR_BUILD) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
|
||||
$(Q) ./$@
|
||||
|
||||
include $(BUILDRULES)
|
||||
diff --git a/m4/Makefile b/m4/Makefile
|
||||
index 654a4fb..036a44b 100644
|
||||
--- a/m4/Makefile
|
||||
+++ b/m4/Makefile
|
||||
@@ -23,6 +23,7 @@ LSRCFILES = \
|
||||
package_utilies.m4 \
|
||||
package_uuiddev.m4 \
|
||||
multilib.m4 \
|
||||
+ ax_prog_cc_for_build.m4 \
|
||||
$(CONFIGURE)
|
||||
|
||||
default:
|
||||
diff --git a/m4/m4-ax_prog_cc_for_build.m4 b/m4/m4-ax_prog_cc_for_build.m4
|
||||
new file mode 100644
|
||||
index 0000000..77fd346
|
||||
--- /dev/null
|
||||
+++ b/m4/m4-ax_prog_cc_for_build.m4
|
||||
@@ -0,0 +1,125 @@
|
||||
+# ===========================================================================
|
||||
+# http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
|
||||
+# ===========================================================================
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AX_PROG_CC_FOR_BUILD
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# This macro searches for a C compiler that generates native executables,
|
||||
+# that is a C compiler that surely is not a cross-compiler. This can be
|
||||
+# useful if you have to generate source code at compile-time like for
|
||||
+# example GCC does.
|
||||
+#
|
||||
+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
|
||||
+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
|
||||
+# The value of these variables can be overridden by the user by specifying
|
||||
+# a compiler with an environment variable (like you do for standard CC).
|
||||
+#
|
||||
+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
|
||||
+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
|
||||
+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
|
||||
+# substituted in the Makefile.
|
||||
+#
|
||||
+# LICENSE
|
||||
+#
|
||||
+# Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
|
||||
+#
|
||||
+# Copying and distribution of this file, with or without modification, are
|
||||
+# permitted in any medium without royalty provided the copyright notice
|
||||
+# and this notice are preserved. This file is offered as-is, without any
|
||||
+# warranty.
|
||||
+
|
||||
+#serial 8
|
||||
+
|
||||
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
|
||||
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
|
||||
+AC_REQUIRE([AC_PROG_CC])dnl
|
||||
+AC_REQUIRE([AC_PROG_CPP])dnl
|
||||
+AC_REQUIRE([AC_EXEEXT])dnl
|
||||
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
+
|
||||
+dnl Use the standard macros, but make them use other variable names
|
||||
+dnl
|
||||
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
|
||||
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
|
||||
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
|
||||
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
|
||||
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
|
||||
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
|
||||
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
|
||||
+pushdef([ac_exeext], ac_build_exeext)dnl
|
||||
+pushdef([ac_objext], ac_build_objext)dnl
|
||||
+pushdef([CC], CC_FOR_BUILD)dnl
|
||||
+pushdef([CPP], CPP_FOR_BUILD)dnl
|
||||
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
|
||||
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
|
||||
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
|
||||
+pushdef([host], build)dnl
|
||||
+pushdef([host_alias], build_alias)dnl
|
||||
+pushdef([host_cpu], build_cpu)dnl
|
||||
+pushdef([host_vendor], build_vendor)dnl
|
||||
+pushdef([host_os], build_os)dnl
|
||||
+pushdef([ac_cv_host], ac_cv_build)dnl
|
||||
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
|
||||
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
|
||||
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
|
||||
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
|
||||
+pushdef([ac_cpp], ac_build_cpp)dnl
|
||||
+pushdef([ac_compile], ac_build_compile)dnl
|
||||
+pushdef([ac_link], ac_build_link)dnl
|
||||
+
|
||||
+save_cross_compiling=$cross_compiling
|
||||
+save_ac_tool_prefix=$ac_tool_prefix
|
||||
+cross_compiling=no
|
||||
+ac_tool_prefix=
|
||||
+
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CPP
|
||||
+AC_EXEEXT
|
||||
+
|
||||
+ac_tool_prefix=$save_ac_tool_prefix
|
||||
+cross_compiling=$save_cross_compiling
|
||||
+
|
||||
+dnl Restore the old definitions
|
||||
+dnl
|
||||
+popdef([ac_link])dnl
|
||||
+popdef([ac_compile])dnl
|
||||
+popdef([ac_cpp])dnl
|
||||
+popdef([ac_cv_host_os])dnl
|
||||
+popdef([ac_cv_host_vendor])dnl
|
||||
+popdef([ac_cv_host_cpu])dnl
|
||||
+popdef([ac_cv_host_alias])dnl
|
||||
+popdef([ac_cv_host])dnl
|
||||
+popdef([host_os])dnl
|
||||
+popdef([host_vendor])dnl
|
||||
+popdef([host_cpu])dnl
|
||||
+popdef([host_alias])dnl
|
||||
+popdef([host])dnl
|
||||
+popdef([LDFLAGS])dnl
|
||||
+popdef([CPPFLAGS])dnl
|
||||
+popdef([CFLAGS])dnl
|
||||
+popdef([CPP])dnl
|
||||
+popdef([CC])dnl
|
||||
+popdef([ac_objext])dnl
|
||||
+popdef([ac_exeext])dnl
|
||||
+popdef([ac_cv_objext])dnl
|
||||
+popdef([ac_cv_exeext])dnl
|
||||
+popdef([ac_cv_prog_cc_g])dnl
|
||||
+popdef([ac_cv_prog_cc_cross])dnl
|
||||
+popdef([ac_cv_prog_cc_works])dnl
|
||||
+popdef([ac_cv_prog_gcc])dnl
|
||||
+popdef([ac_cv_prog_CPP])dnl
|
||||
+
|
||||
+dnl Finally, set Makefile variables
|
||||
+dnl
|
||||
+BUILD_EXEEXT=$ac_build_exeext
|
||||
+BUILD_OBJEXT=$ac_build_objext
|
||||
+AC_SUBST(BUILD_EXEEXT)dnl
|
||||
+AC_SUBST(BUILD_OBJEXT)dnl
|
||||
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
|
||||
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
|
||||
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
|
||||
+])
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils toolchain-funcs multilib
|
||||
inherit autotools eutils toolchain-funcs multilib
|
||||
|
||||
DESCRIPTION="xfs filesystem utilities"
|
||||
HOMEPAGE="http://oss.sgi.com/projects/xfs/"
|
||||
@ -39,6 +39,9 @@ pkg_setup() {
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-3.2.2-sharedlibs.patch
|
||||
|
||||
# http://oss.sgi.com/bugzilla/show_bug.cgi?id=1114
|
||||
epatch "${FILESDIR}"/${PN}-3.2.2-Fix-cross-compile-builds.patch
|
||||
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
@ -59,8 +62,13 @@ src_prepare() {
|
||||
sed -i \
|
||||
-e 's|-lreadline|\0 -lncurses|' \
|
||||
-e 's|-lblkid|\0 -luuid|' \
|
||||
configure || die
|
||||
configure.ac || die
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
# xfsprogs has a custom install-sh.
|
||||
cp include/install-sh .
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
Loading…
x
Reference in New Issue
Block a user