Really fix cross-compiling and building of tools this time
This commit is contained in:
Behdad Esfahbod
parent
32c1d32cbd
commit
bc62c40597
|
|
@ -105,6 +105,7 @@ AC_SUBST(WARN_CFLAGS)
|
|||
|
||||
dnl ==========================================================================
|
||||
|
||||
AX_CC_FOR_BUILD()
|
||||
AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
|
||||
AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
|
||||
AM_CONDITIONAL(ENABLE_SHARED, test "$enable_shared" = "yes")
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
#
|
||||
# $Id $
|
||||
#
|
||||
# Copyright © 2003 Keith Packard
|
||||
# Copyright © 2013 Google, Inc.
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
|
|
@ -22,43 +21,13 @@
|
|||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# Google Author(s): Behdad Esfahbod
|
||||
|
||||
INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
|
||||
TAG=case
|
||||
DEPS = $(srcdir)/CaseFolding.txt
|
||||
ARGS = $(srcdir)/CaseFolding.txt
|
||||
DIST = $(srcdir)/CaseFolding.txt
|
||||
|
||||
TMPL=fccase.tmpl.h
|
||||
STMPL=${top_srcdir}/fc-case/${TMPL}
|
||||
TARG=fccase.h
|
||||
|
||||
noinst_PROGRAMS=fc-case
|
||||
|
||||
noinst_HEADERS=$(TARG)
|
||||
|
||||
fc_case_CC = $(CC_FOR_BUILD)
|
||||
|
||||
CASEFOLDING=CaseFolding.txt
|
||||
SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
|
||||
|
||||
EXTRA_DIST = $(TARG) $(TMPL) $(CASEFOLDING)
|
||||
|
||||
## BUILT_SOURCES doesn't effect to 'distcheck'
|
||||
## so $(ALIAS_FILES) has to be appeared prior to fc-case$(EXEEXT)
|
||||
## to make sure availability.
|
||||
$(TARG): $(STMPL) $(ALIAS_FILES) fc-case$(EXEEXT) $(SCASEFOLDING)
|
||||
$(AM_V_GEN) $(RM) $(TARG); \
|
||||
./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
|
||||
mv $(TARG).tmp $(TARG)
|
||||
|
||||
ALIAS_FILES = fcalias.h fcaliastail.h
|
||||
|
||||
BUILT_SOURCES = $(ALIAS_FILES)
|
||||
|
||||
$(ALIAS_FILES):
|
||||
$(AM_V_GEN) touch $@
|
||||
|
||||
CLEANFILES = $(ALIAS_FILES)
|
||||
|
||||
DISTCLEANFILES = $(TARG)
|
||||
|
||||
MAINTAINERCLEANFILES = $(TARG)
|
||||
include $(top_srcdir)/Tools.mk
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
#
|
||||
# $Id $
|
||||
#
|
||||
# Copyright © 2003 Keith Packard
|
||||
# Copyright © 2013 Google, Inc.
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
|
|
@ -22,43 +21,13 @@
|
|||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# Google Author(s): Behdad Esfahbod
|
||||
|
||||
INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
|
||||
TAG = glyphname
|
||||
DEPS = $(srcdir)/zapfdingbats.txt
|
||||
ARGS = $(srcdir)/zapfdingbats.txt
|
||||
DIST = $(srcdir)/zapfdingbats.txt
|
||||
|
||||
TMPL=fcglyphname.tmpl.h
|
||||
STMPL=${top_srcdir}/fc-glyphname/${TMPL}
|
||||
TARG=fcglyphname.h
|
||||
|
||||
noinst_PROGRAMS=fc-glyphname
|
||||
|
||||
noinst_HEADERS=$(TARG)
|
||||
|
||||
fc_glyphname_CC = $(CC_FOR_BUILD)
|
||||
|
||||
GLYPHNAME=zapfdingbats.txt
|
||||
SGLYPHNAME=${top_srcdir}/fc-glyphname/zapfdingbats.txt
|
||||
|
||||
EXTRA_DIST = $(TARG) $(TMPL) $(GLYPHNAME)
|
||||
|
||||
## BUILT_SOURCES doesn't effect to 'distcheck'
|
||||
## so $(ALIAS_FILES) has to be appeared prior to fc-glyphname$(EXEEXT)
|
||||
## to make sure availability.
|
||||
$(TARG): $(STMPL) $(ALIAS_FILES) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
|
||||
$(AM_V_GEN) $(RM) $(TARG); \
|
||||
./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
|
||||
mv $(TARG).tmp $(TARG)
|
||||
|
||||
ALIAS_FILES = fcalias.h fcaliastail.h
|
||||
|
||||
BUILT_SOURCES = $(ALIAS_FILES)
|
||||
|
||||
$(ALIAS_FILES):
|
||||
$(AM_V_GEN) touch $@
|
||||
|
||||
CLEANFILES = $(ALIAS_FILES)
|
||||
|
||||
DISTCLEANFILES = $(TARG)
|
||||
|
||||
MAINTAINERCLEANFILES = $(TARG)
|
||||
include $(top_srcdir)/Tools.mk
|
||||
|
||||
-include $(top_srcdir)/git.mk
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ dump (FcGlyphName * const *table, const char *name)
|
|||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
main (int argc FC_UNUSED, char **argv)
|
||||
{
|
||||
char *files[MAX_GLYPHFILE];
|
||||
char line[1024];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
#
|
||||
# $Id $
|
||||
#
|
||||
# Copyright © 2003 Keith Packard
|
||||
# Copyright © 2013 Google, Inc.
|
||||
#
|
||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
||||
# documentation for any purpose is hereby granted without fee, provided that
|
||||
|
|
@ -22,41 +21,14 @@
|
|||
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
# PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
# Google Author(s): Behdad Esfahbod
|
||||
|
||||
INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
|
||||
TAG = lang
|
||||
DEPS = $(ORTH)
|
||||
ARGS = -d $(srcdir) $(ORTH)
|
||||
DIST = $(ORTH)
|
||||
|
||||
TMPL=fclang.tmpl.h
|
||||
STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h
|
||||
TARG=fclang.h
|
||||
|
||||
noinst_PROGRAMS=fc-lang
|
||||
|
||||
noinst_HEADERS=$(TARG)
|
||||
|
||||
fc_lang_CC = $(CC_FOR_BUILD)
|
||||
|
||||
EXTRA_DIST = $(TARG) $(TMPL) $(ORTH)
|
||||
|
||||
## BUILT_SOURCES doesn't effect to 'distcheck'
|
||||
## so $(ALIAS_FILES) has to be appeared prior to fc-lang$(EXEEXT)
|
||||
## to make sure availability.
|
||||
$(TARG):$(ORTH) $(ALIAS_FILES) fc-lang${EXEEXT} $(STMPL)
|
||||
$(AM_V_GEN) $(RM) $(TARG); \
|
||||
./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
|
||||
mv $(TARG).tmp $(TARG)
|
||||
|
||||
ALIAS_FILES = fcalias.h fcaliastail.h
|
||||
|
||||
BUILT_SOURCES = $(ALIAS_FILES)
|
||||
|
||||
$(ALIAS_FILES):
|
||||
$(AM_V_GEN) touch $@
|
||||
|
||||
CLEANFILES = $(ALIAS_FILES)
|
||||
|
||||
DISTCLEANFILES = $(TARG)
|
||||
|
||||
MAINTAINERCLEANFILES = $(TARG)
|
||||
include $(top_srcdir)/Tools.mk
|
||||
|
||||
# NOTE:
|
||||
#
|
||||
|
|
|
|||
|
|
@ -38,17 +38,17 @@
|
|||
*/
|
||||
|
||||
FcPrivate void
|
||||
FcCacheObjectReference (void *object)
|
||||
FcCacheObjectReference (void *object FC_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
FcPrivate void
|
||||
FcCacheObjectDereference (void *object)
|
||||
FcCacheObjectDereference (void *object FC_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
FcPrivate FcChar8 *
|
||||
FcLangNormalize (const FcChar8 *lang)
|
||||
FcLangNormalize (const FcChar8 *lang FC_UNUSED)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -252,7 +252,7 @@ static int compare (const void *a, const void *b)
|
|||
#define BitSet(map, i) ((map)[(entries[i].id)>>5] |= ((FcChar32) 1 << ((entries[i].id) & 0x1f)))
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
main (int argc FC_UNUSED, char **argv)
|
||||
{
|
||||
static Entry entries[MAX_LANG];
|
||||
static FcCharSet *sets[MAX_LANG];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,77 @@
|
|||
# ===========================================================================
|
||||
# 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 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],
|
||||
[# 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
|
||||
CC_FOR_BUILD=gcc
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CC_FOR_BUILD)
|
||||
# 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} -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
|
||||
Loading…
Reference in New Issue