diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-11 08:21:30 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-05-11 08:21:30 +0000 |
| commit | 6b3338587e25eb4940a381f8aade70f57d587826 (patch) | |
| tree | d56010980aac669e212947ba81e454bd6533c5a5 /Build | |
| parent | f9f0c09fbf317d69c3001ad562b2eae14f0ebfb2 (diff) | |
build fix: ICU libraries for amd64-kfreebsd
git-svn-id: svn://tug.org/texlive/trunk@22422 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/libs/icu/icu-4.6-PATCHES/patch-14-GENCCODE_ASSEMBLY | 13 | ||||
| -rw-r--r-- | Build/source/libs/icu/icu-4.6/config/mh-linux | 3 |
4 files changed, 22 insertions, 2 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index d88c98f6f17..c07f6654ea3 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,7 +1,7 @@ 2011-04-14 Peter Breitenlohner <peb@mppmu.mpg.de> - * Makefile.am, configure.ac: Conditional cross_compiling => cross - as in libs/icu, texk/dvipng, and texk/web2c. + * Makefile.am, configure.ac: Conditional 'cross_compiling' => + 'cross' as in libs/icu, texk/dvipng, and texk/web2c. * version.ac: Switch 2011/dev => 2011. diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog index ba33e72dde8..f58ff44d434 100644 --- a/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog +++ b/Build/source/libs/icu/icu-4.6-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2011-05-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-14-GENCCODE_ASSEMBLY (new): For amd64-kfreebsd. + 2011-05-09 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-13-STATIC_PREFIX (new): Never use libsicuxxx.a. diff --git a/Build/source/libs/icu/icu-4.6-PATCHES/patch-14-GENCCODE_ASSEMBLY b/Build/source/libs/icu/icu-4.6-PATCHES/patch-14-GENCCODE_ASSEMBLY new file mode 100644 index 00000000000..ab29c15eee3 --- /dev/null +++ b/Build/source/libs/icu/icu-4.6-PATCHES/patch-14-GENCCODE_ASSEMBLY @@ -0,0 +1,13 @@ +diff -ur icu-4.6.orig/source/config/mh-linux icu-4.6/source/config/mh-linux +--- icu-4.6.orig/source/config/mh-linux 2010-06-02 01:35:40.000000000 +0200 ++++ icu-4.6/source/config/mh-linux 2011-05-11 09:43:13.000000000 +0200 +@@ -37,6 +37,9 @@ + ## Non-shared intermediate object suffix + STATIC_O = ao + ++## The type of assembly needed when pkgdata is used for generating shared libraries. ++GENCCODE_ASSEMBLY=-a gcc ++ + ## Compilation rules + %.$(STATIC_O): $(srcdir)/%.c + $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< diff --git a/Build/source/libs/icu/icu-4.6/config/mh-linux b/Build/source/libs/icu/icu-4.6/config/mh-linux index 6a8299f11eb..479479274df 100644 --- a/Build/source/libs/icu/icu-4.6/config/mh-linux +++ b/Build/source/libs/icu/icu-4.6/config/mh-linux @@ -37,6 +37,9 @@ SO = so ## Non-shared intermediate object suffix STATIC_O = ao +## The type of assembly needed when pkgdata is used for generating shared libraries. +GENCCODE_ASSEMBLY=-a gcc + ## Compilation rules %.$(STATIC_O): $(srcdir)/%.c $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $< |