summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gmail.com>2011-02-08 16:41:18 +0100
committerDiego Elio Pettenò <flameeyes@gmail.com>2011-02-08 16:41:18 +0100
commit06834930632cc2997f3cea770fa7a8931f3fa5ed (patch)
treeaa652041ccde43338539c151f0fe2afd053b07d5
parentb7067704706b6dd72b00d14a17be213a06bea502 (diff)
build-sys: make libatasmart easily cross-compilable
Pick up the AX_CC_FOR_BUILD macro from autoconf-archive (improved, going to be sent there soon), then use that one to find the host's compiler. Build the strpool in a different directory, since you cannot override CC and other variables on a per-target basis yet. While this adds recursivity to the build system is the best hope you have to properly solve the cross-compilation. Update .gitignore accordingly to the above changes, and make sure bootstrap.sh search macro files in the m4 directory.
-rw-r--r--.gitignore5
-rw-r--r--Makefile.am16
-rwxr-xr-xbootstrap.sh2
-rw-r--r--configure.ac2
-rw-r--r--m4/ax_cc_for_build.m4105
-rw-r--r--strpool/Makefile.am28
6 files changed, 146 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 46335b2..7630d9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
*~
-m4/
+m4/lt*
+m4/libtool.m4
+strpool/strpool
atasmart.strpool.c
-strpool
skdump
sktest
.deps/
diff --git a/Makefile.am b/Makefile.am
index b5f9476..1c70db1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,8 @@ EXTRA_DIST = \
blob-examples/WDC_WD5000AAKS--00TMA0-12.01C01 \
vala/atasmart.vapi
-SUBDIRS =
+# build the strpool tool first
+SUBDIRS = strpool .
CLEANFILES = atasmart.strpool.c
@@ -64,9 +65,6 @@ sbin_PROGRAMS = \
skdump \
sktest
-noinst_PROGRAMS = \
- strpool
-
lib_LTLIBRARIES = \
libatasmart.la
@@ -90,13 +88,13 @@ libatasmart_la_LIBADD = \
libatasmart_la_CFLAGS = \
$(LIBUDEV_CFLAGS)
-strpool_SOURCES = \
- strpool.c
-
BUILT_SOURCES = \
atasmart.strpool.c
-atasmart.strpool.c: atasmart.c strpool
- $(top_builddir)/strpool $< $@
+strpool/strpool:
+ $(MAKE) -C strpool strpool
+
+atasmart.strpool.c: atasmart.c strpool/strpool
+ $(top_builddir)/strpool/strpool $< $@
ACLOCAL_AMFLAGS = -I m4
diff --git a/bootstrap.sh b/bootstrap.sh
index 918814d..2bd8c1e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -54,7 +54,7 @@ else
mkdir -p m4
"$LIBTOOLIZE" -c --force
- run_versioned aclocal "$VERSION"
+ run_versioned aclocal "$VERSION" -I m4
run_versioned autoconf 2.63 -Wall
run_versioned autoheader 2.63
run_versioned automake "$VERSION" --copy --foreign --add-missing
diff --git a/configure.ac b/configure.ac
index 3573326..1cc5d6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ fi
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_GCC_TRADITIONAL
+AX_CC_FOR_BUILD
AC_USE_SYSTEM_EXTENSIONS
# C++
@@ -123,6 +124,7 @@ PKG_CHECK_MODULES([LIBUDEV], [libudev >= 143])
AC_CONFIG_FILES([
Makefile
+strpool/Makefile
libatasmart.pc
])
AC_OUTPUT
diff --git a/m4/ax_cc_for_build.m4 b/m4/ax_cc_for_build.m4
new file mode 100644
index 0000000..822d422
--- /dev/null
+++ b/m4/ax_cc_for_build.m4
@@ -0,0 +1,105 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
+#
+# LICENSE
+#
+# Copyright (c) 2010 Diego Elio Pettenò <flameeyes@gmail.com>
+# Copyright (c) 2010 Reuben Thomas <rrt@sc3d.org>
+# Copyright (c) 1999 Richard Henderson <rth@redhat.com>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
+AC_DEFUN([AX_CC_FOR_BUILD], [
+ AC_REQUIRE([AC_PROG_CC])
+
+ dnl Declare the new variables
+ AC_ARG_VAR([CC_FOR_BUILD],
+ [Host's C compiler command for cross-compilation @<:@default=$(CC)@:>@])
+ AC_ARG_VAR([BUILD_CFLAGS],
+ [Host's C compiler flags @<:@default=$(CFLAGS)@:>@])
+ AC_ARG_VAR([BUILD_LDFLAGS],
+ [Host's linker flags @<:@default=$(LDFLAGS)@:>@])
+
+ dnl Put a plausible default for CC_FOR_BUILD in Makefile.
+ if test -z "$CC_FOR_BUILD"; then
+ if test "x$cross_compiling" = "xno"; then
+ CC_FOR_BUILD=${CC}
+ else
+ AC_CHECK_PROGS(CC_FOR_BUILD, [gcc cc])
+ fi
+ fi
+
+ if test "x${BUILD_CFLAGS+set}" != "xset" ; then
+ if test "x$cross_compiling" = "xyes" ; then
+ BUILD_CFLAGS=
+ else
+ BUILD_CFLAGS=${CFLAGS}
+ fi
+ fi
+
+ if test "x${BUILD_LDFLAGS+set}" != "xset" ; then
+ if test "x$cross_compiling" = "xyes" ; then
+ BUILD_LDFLAGS=
+ else
+ BUILD_LDFLAGS=${LDFLAGS}
+ fi
+ fi
+
+ dnl Also set EXEEXT_FOR_BUILD.
+ if test "x$cross_compiling" = "xno"; then
+ EXEEXT_FOR_BUILD='$(EXEEXT)'
+ else
+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
+ [rm -f conftest*
+ echo 'int main () { return 0; }' > conftest.c
+ bfd_cv_build_exeext=
+ ${CC_FOR_BUILD} ${LDFLAGS} ${CFLAGS} -o conftest conftest.c 1>&5 2>&5
+ for file in conftest.*; do
+ case $file in
+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+ esac
+ done
+ rm -f conftest*
+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
+ EXEEXT_FOR_BUILD=""
+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+ fi
+ AC_SUBST(EXEEXT_FOR_BUILD)
+])dnl
diff --git a/strpool/Makefile.am b/strpool/Makefile.am
new file mode 100644
index 0000000..6170754
--- /dev/null
+++ b/strpool/Makefile.am
@@ -0,0 +1,28 @@
+# This file is part of libatasmart.
+#
+# Copyright 2008 Lennart Poettering
+#
+# libatasmart is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# libatasmart is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with libatasmart. If not, If not, see
+# <http://www.gnu.org/licenses/>.
+
+CC = @CC_FOR_BUILD@
+CFLAGS = @BUILD_CFLAGS@
+LDFLAGS = @BUILD_LDFLAGS@
+
+noinst_PROGRAMS = \
+ strpool
+
+strpool_SOURCES = \
+ ../strpool.c
+